aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0736-ARM-dts-Adapt-to-upstream-changes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0736-ARM-dts-Adapt-to-upstream-changes.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0736-ARM-dts-Adapt-to-upstream-changes.patch304
1 files changed, 304 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0736-ARM-dts-Adapt-to-upstream-changes.patch b/target/linux/bcm27xx/patches-5.10/950-0736-ARM-dts-Adapt-to-upstream-changes.patch
new file mode 100644
index 0000000000..9bb21fda87
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.10/950-0736-ARM-dts-Adapt-to-upstream-changes.patch
@@ -0,0 +1,304 @@
+From e6942acef85ed8ce64d64147aa2328fbc67065c9 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Tue, 27 Jul 2021 22:22:52 +0100
+Subject: [PATCH] ARM: dts: Adapt to upstream changes
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 4 ++--
+ arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts | 2 +-
+ arch/arm/boot/dts/bcm2708-rpi-b.dts | 2 +-
+ arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 2 +-
+ arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 2 +-
+ arch/arm/boot/dts/bcm2708-rpi-zero.dts | 2 +-
+ arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 4 ++--
+ arch/arm/boot/dts/bcm270x.dtsi | 2 +-
+ arch/arm/boot/dts/bcm2710-rpi-2-b.dts | 4 ++--
+ arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 4 ++--
+ arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 4 ++--
+ arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 2 +-
+ arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++--
+ arch/arm/boot/dts/bcm2711-rpi-400.dts | 10 ++++++----
+ arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 10 ++++++----
+ 15 files changed, 31 insertions(+), 27 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+@@ -90,13 +90,13 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&gpio 47 0>;
+ };
+
+- pwr_led: pwr {
++ pwr_led: led-pwr {
+ label = "led1";
+ linux,default-trigger = "input";
+ gpios = <&gpio 35 0>;
+--- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
+@@ -103,7 +103,7 @@ i2c_csi_dsi: &i2c1 {
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&gpio 16 1>;
+--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
+@@ -90,7 +90,7 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&gpio 16 1>;
+--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
++++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
+@@ -2,7 +2,7 @@
+ #include "bcm2708-rpi.dtsi"
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&gpio 47 0>;
+--- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
+@@ -139,7 +139,7 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "actpwr";
+ gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
+@@ -93,7 +93,7 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "actpwr";
+ gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
++++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+@@ -90,13 +90,13 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&gpio 47 0>;
+ };
+
+- pwr_led: pwr {
++ pwr_led: led-pwr {
+ label = "led1";
+ linux,default-trigger = "input";
+ gpios = <&gpio 35 0>;
+--- a/arch/arm/boot/dts/bcm270x.dtsi
++++ b/arch/arm/boot/dts/bcm270x.dtsi
+@@ -33,7 +33,7 @@
+ };
+ #endif
+
+- /delete-node/ sdhci@7e300000;
++ /delete-node/ mmc@7e300000;
+
+ sdhci: mmc: mmc@7e300000 {
+ compatible = "brcm,bcm2835-mmc", "brcm,bcm2835-sdhci";
+--- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
+@@ -90,13 +90,13 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&gpio 47 0>;
+ };
+
+- pwr_led: pwr {
++ pwr_led: led-pwr {
+ label = "led1";
+ linux,default-trigger = "input";
+ gpios = <&gpio 35 0>;
+--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
+@@ -149,13 +149,13 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&gpio 29 0>;
+ };
+
+- pwr_led: pwr {
++ pwr_led: led-pwr {
+ label = "led1";
+ linux,default-trigger = "default-on";
+ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+@@ -164,13 +164,13 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&virtgpio 0 0>;
+ };
+
+- pwr_led: pwr {
++ pwr_led: led-pwr {
+ label = "led1";
+ linux,default-trigger = "input";
+ gpios = <&expgpio 7 0>;
+--- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
+@@ -123,7 +123,7 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&virtgpio 0 0>;
+--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+@@ -579,13 +579,13 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
+ };
+
+- pwr_led: pwr {
++ pwr_led: led-pwr {
+ label = "led1";
+ linux,default-trigger = "default-on";
+ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
+@@ -28,11 +28,11 @@
+ };
+
+ leds {
+- act {
++ led-act {
+ gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
+ };
+
+- pwr {
++ led-pwr {
+ label = "PWR";
+ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
+ default-state = "keep";
+@@ -181,12 +181,14 @@
+ &hdmi0 {
+ clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
+ clock-names = "hdmi", "bvb", "audio", "cec";
++ wifi-2.4ghz-coexistence;
+ status = "okay";
+ };
+
+ &hdmi1 {
+ clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
+ clock-names = "hdmi", "bvb", "audio", "cec";
++ wifi-2.4ghz-coexistence;
+ status = "okay";
+ };
+
+@@ -586,14 +588,14 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "default-on";
+ default-state = "on";
+ gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
+ };
+
+- pwr_led: pwr {
++ pwr_led: led-pwr {
+ label = "led1";
+ linux,default-trigger = "default-on";
+ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+@@ -28,11 +28,11 @@
+ };
+
+ leds {
+- act {
++ led-act {
+ gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
+ };
+
+- pwr {
++ led-pwr {
+ label = "PWR";
+ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
+ default-state = "keep";
+@@ -193,12 +193,14 @@
+ &hdmi0 {
+ clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
+ clock-names = "hdmi", "bvb", "audio", "cec";
++ wifi-2.4ghz-coexistence;
+ status = "okay";
+ };
+
+ &hdmi1 {
+ clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
+ clock-names = "hdmi", "bvb", "audio", "cec";
++ wifi-2.4ghz-coexistence;
+ status = "okay";
+ };
+
+@@ -597,13 +599,13 @@
+ };
+
+ &leds {
+- act_led: act {
++ act_led: led-act {
+ label = "led0";
+ linux,default-trigger = "mmc0";
+ gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
+ };
+
+- pwr_led: pwr {
++ pwr_led: led-pwr {
+ label = "led1";
+ linux,default-trigger = "default-on";
+ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 20:40:51 +0000