1 From e6942acef85ed8ce64d64147aa2328fbc67065c9 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Tue, 27 Jul 2021 22:22:52 +0100
4 Subject: [PATCH] ARM: dts: Adapt to upstream changes
6 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
8 arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 4 ++--
9 arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts | 2 +-
10 arch/arm/boot/dts/bcm2708-rpi-b.dts | 2 +-
11 arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 2 +-
12 arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 2 +-
13 arch/arm/boot/dts/bcm2708-rpi-zero.dts | 2 +-
14 arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 4 ++--
15 arch/arm/boot/dts/bcm270x.dtsi | 2 +-
16 arch/arm/boot/dts/bcm2710-rpi-2-b.dts | 4 ++--
17 arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 4 ++--
18 arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 4 ++--
19 arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 2 +-
20 arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++--
21 arch/arm/boot/dts/bcm2711-rpi-400.dts | 10 ++++++----
22 arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 10 ++++++----
23 15 files changed, 31 insertions(+), 27 deletions(-)
25 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
26 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
34 linux,default-trigger = "mmc0";
41 linux,default-trigger = "input";
43 --- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
44 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
45 @@ -103,7 +103,7 @@ i2c_csi_dsi: &i2c1 {
52 linux,default-trigger = "mmc0";
54 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
55 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
63 linux,default-trigger = "mmc0";
65 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
66 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
68 #include "bcm2708-rpi.dtsi"
74 linux,default-trigger = "mmc0";
76 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
77 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
85 linux,default-trigger = "actpwr";
86 gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
87 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
88 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
96 linux,default-trigger = "actpwr";
97 gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
98 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
99 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
107 linux,default-trigger = "mmc0";
108 gpios = <&gpio 47 0>;
114 linux,default-trigger = "input";
115 gpios = <&gpio 35 0>;
116 --- a/arch/arm/boot/dts/bcm270x.dtsi
117 +++ b/arch/arm/boot/dts/bcm270x.dtsi
122 - /delete-node/ sdhci@7e300000;
123 + /delete-node/ mmc@7e300000;
125 sdhci: mmc: mmc@7e300000 {
126 compatible = "brcm,bcm2835-mmc", "brcm,bcm2835-sdhci";
127 --- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
128 +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
136 linux,default-trigger = "mmc0";
137 gpios = <&gpio 47 0>;
143 linux,default-trigger = "input";
144 gpios = <&gpio 35 0>;
145 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
146 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
147 @@ -149,13 +149,13 @@
154 linux,default-trigger = "mmc0";
155 gpios = <&gpio 29 0>;
161 linux,default-trigger = "default-on";
162 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
163 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
164 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
165 @@ -164,13 +164,13 @@
172 linux,default-trigger = "mmc0";
173 gpios = <&virtgpio 0 0>;
179 linux,default-trigger = "input";
180 gpios = <&expgpio 7 0>;
181 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
182 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
190 linux,default-trigger = "mmc0";
191 gpios = <&virtgpio 0 0>;
192 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
193 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
194 @@ -580,13 +580,13 @@
201 linux,default-trigger = "mmc0";
202 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
208 linux,default-trigger = "default-on";
209 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
210 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
211 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
218 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
224 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
225 default-state = "keep";
226 @@ -181,12 +181,14 @@
228 clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
229 clock-names = "hdmi", "bvb", "audio", "cec";
230 + wifi-2.4ghz-coexistence;
235 clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
236 clock-names = "hdmi", "bvb", "audio", "cec";
237 + wifi-2.4ghz-coexistence;
241 @@ -586,14 +588,14 @@
248 linux,default-trigger = "default-on";
249 default-state = "on";
250 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
256 linux,default-trigger = "default-on";
257 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
258 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
259 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
266 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
272 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
273 default-state = "keep";
274 @@ -193,12 +193,14 @@
276 clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
277 clock-names = "hdmi", "bvb", "audio", "cec";
278 + wifi-2.4ghz-coexistence;
283 clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
284 clock-names = "hdmi", "bvb", "audio", "cec";
285 + wifi-2.4ghz-coexistence;
289 @@ -597,13 +599,13 @@
296 linux,default-trigger = "mmc0";
297 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
303 linux,default-trigger = "default-on";
304 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;