From a2433870cedb0863502eabbbc6560dac706b7007 Mon Sep 17 00:00:00 2001 From: Joshua Riek Date: Fri, 19 May 2023 17:25:24 -0400 Subject: [PATCH] squash remove chosen bootargs patch --- .../0003-fix-opi5-and-opi5b-device-tree.patch | 29 ++++---------- ...e-chosen-bootargs-for-opi5-and-opi5b.patch | 38 ------------------- packages/linux-rockchip/debian/patches/series | 1 - 3 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 packages/linux-rockchip/debian/patches/0009-remove-chosen-bootargs-for-opi5-and-opi5b.patch diff --git a/packages/linux-rockchip/debian/patches/0003-fix-opi5-and-opi5b-device-tree.patch b/packages/linux-rockchip/debian/patches/0003-fix-opi5-and-opi5b-device-tree.patch index a663a36a..491222a6 100644 --- a/packages/linux-rockchip/debian/patches/0003-fix-opi5-and-opi5b-device-tree.patch +++ b/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 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 - diff --git a/packages/linux-rockchip/debian/patches/0009-remove-chosen-bootargs-for-opi5-and-opi5b.patch b/packages/linux-rockchip/debian/patches/0009-remove-chosen-bootargs-for-opi5-and-opi5b.patch deleted file mode 100644 index 41c6368a..00000000 --- a/packages/linux-rockchip/debian/patches/0009-remove-chosen-bootargs-for-opi5-and-opi5b.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 49cf06ec6d95a40179c31c4b8b3baa7c229f0ae4 Mon Sep 17 00:00:00 2001 -From: Joshua Riek -Date: Fri, 19 May 2023 15:12:46 -0400 -Subject: [PATCH] arm64: dts: remove chosen bootargs for opi5 and opi5b - ---- - arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 2 ++ - arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts -index ac8ff3231ff2..d90b128eb17c 100755 ---- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts -@@ -14,6 +14,8 @@ - #include "rk3588s-orangepi-5-camera2.dtsi" - #include "rk3588s-orangepi-5-camera3.dtsi" - -+/delete-node/ &chosen; -+ - / { - model = "Orange Pi 5"; - compatible = "rockchip,rk3588s-orangepi-5", "rockchip,rk3588"; -diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts -index 2e20a58154d4..a900f6c04956 100755 ---- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts -@@ -14,6 +14,8 @@ - #include "rk3588s-orangepi-5-camera2.dtsi" - #include "rk3588s-orangepi-5-camera3.dtsi" - -+/delete-node/ &chosen; -+ - / { - model = "Orange Pi 5B"; - compatible = "rockchip,rk3588s-orangepi-5", "rockchip,rk3588"; --- -2.25.1 diff --git a/packages/linux-rockchip/debian/patches/series b/packages/linux-rockchip/debian/patches/series index f9e8a3d7..73706231 100644 --- a/packages/linux-rockchip/debian/patches/series +++ b/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