squash remove chosen bootargs patch

packages/linux-rockchip/debian/patches/0003-fix-opi5-and-opi5b-device-tree.patch

@@ -1,16 +1,15 @@
-From 01b504d698cf931bea64c71b0686d4b1280099f7 Mon Sep 17 00:00:00 2001
+From 07109ca4723dfc38c097481e273b25c86c0ed59b Mon Sep 17 00:00:00 2001
 From: Joshua Riek <[email protected]>
 Date: Thu, 18 May 2023 10:21:45 -0400
-Subject: [PATCH 3/8] arm64: dts: fix opi5 and opi5b device tree
+Subject: [PATCH] arm64: dts: fix opi5 and opi5b device tree
 
 ---
  arch/arm64/boot/dts/rockchip/Makefile         |   1 +
- .../boot/dts/rockchip/rk3588s-orangepi-5.dts  |   2 -
  .../boot/dts/rockchip/rk3588s-orangepi-5.dtsi |  14 +-
- .../boot/dts/rockchip/rk3588s-orangepi-5b.dts | 425 ++++++++++++++++++
+ .../boot/dts/rockchip/rk3588s-orangepi-5b.dts | 427 ++++++++++++++++++
  .../boot/dts/rockchip/rk3588s-orangepi.dtsi   |  15 +-
  .../boot/dts/rockchip/rk3588s-pinctrl.dtsi    |   6 +
- 6 files changed, 445 insertions(+), 18 deletions(-)
+ 5 files changed, 447 insertions(+), 16 deletions(-)
  create mode 100755 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts
 
 diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
@@ -25,19 +24,6 @@ index 13f5fe5fe3b2..f52e1232562e 100644
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb
 
  subdir-y := $(dts-dirs) overlay
-diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
-index 0307c1c45aa9..ac8ff3231ff2 100755
---- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
-@@ -18,8 +18,6 @@ / {
- 	model = "Orange Pi 5";
- 	compatible = "rockchip,rk3588s-orangepi-5", "rockchip,rk3588";
-
--	/delete-node/ chosen;
--
- 	vcc_3v3_sd_s0: vcc-3v3-sd-s0 {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vcc_3v3_sd_s0";
 diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
 index 8f8ebcb0db68..9aad27c238e3 100755
 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
@@ -86,10 +72,10 @@ index 8f8ebcb0db68..9aad27c238e3 100755
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts
 new file mode 100755
-index 000000000000..2e20a58154d4
+index 000000000000..b66ab41524e8
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts
-@@ -0,0 +1,425 @@
+@@ -0,0 +1,427 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
@@ -110,6 +96,8 @@ index 000000000000..2e20a58154d4
 +	model = "Orange Pi 5B";
 +	compatible = "rockchip,rk3588s-orangepi-5", "rockchip,rk3588";
 +
++	/delete-node/ chosen;
++
 +	vcc_3v3_sd_s0: vcc-3v3-sd-s0 {
 +		compatible = "regulator-fixed";
 +		regulator-name = "vcc_3v3_sd_s0";
@@ -586,4 +574,3 @@ index 0aceee389623..da5f147391a3 100644
  };
 -- 
 2.25.1
-

packages/linux-rockchip/debian/patches/series

@@ -6,4 +6,3 @@
 0006-suppress-unsupported-format-modifier.patch
 0007-suppress-use-tmds-mode-dev-info.patch
 0008-fix-khadas-compile-warning.patch
-0009-remove-chosen-bootargs-for-opi5-and-opi5b.patch