1 From d29fb06a96cac4111d23e8f1cfc4d191d2fd5419 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Mon, 1 Nov 2021 15:44:31 +0000
4 Subject: [PATCH] ARM: dts: Rename Zero 2 W DT files
6 Retain the old names for backwards compatibility for a while, while the
7 necessary firmware change rolls out.
9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
11 arch/arm/boot/dts/Makefile | 1 +
12 arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 177 ++++++++++++++++++++
13 arch/arm/boot/dts/bcm2710-rpi-zero-2.dts | 178 +--------------------
14 3 files changed, 179 insertions(+), 177 deletions(-)
15 create mode 100644 arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
17 --- a/arch/arm/boot/dts/Makefile
18 +++ b/arch/arm/boot/dts/Makefile
19 @@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
20 bcm2708-rpi-zero.dtb \
21 bcm2708-rpi-zero-w.dtb \
22 bcm2710-rpi-zero-2.dtb \
23 + bcm2710-rpi-zero-2-w.dtb \
28 +++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
32 +#include "bcm2710.dtsi"
33 +#include "bcm2709-rpi.dtsi"
34 +#include "bcm283x-rpi-csi1-2lane.dtsi"
35 +#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
36 +#include "bcm2708-rpi-bt.dtsi"
37 +#include "bcm283x-rpi-cam1-regulator.dtsi"
40 + compatible = "raspberrypi,model-zero-2-w", "brcm,bcm2837";
41 + model = "Raspberry Pi Zero 2 W";
44 + bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
55 + spi0_pins: spi0_pins {
56 + brcm,pins = <9 10 11>;
57 + brcm,function = <4>; /* alt0 */
60 + spi0_cs_pins: spi0_cs_pins {
62 + brcm,function = <1>; /* output */
67 + brcm,function = <4>;
72 + brcm,function = <4>;
76 + brcm,pins = <18 19 20 21>;
77 + brcm,function = <4>; /* alt0 */
80 + sdio_pins: sdio_pins {
81 + brcm,pins = <34 35 36 37 38 39>;
82 + brcm,function = <7>; // alt3 = SD1
83 + brcm,pull = <0 2 2 2 2 2>;
88 + brcm,function = <4>; /* alt0:GPCLK2 */
92 + uart0_pins: uart0_pins {
93 + brcm,pins = <30 31 32 33>;
94 + brcm,function = <7>; /* alt3=UART0 */
95 + brcm,pull = <2 0 0 2>; /* up none none up */
98 + uart1_pins: uart1_pins {
104 + audio_pins: audio_pins {
106 + brcm,function = <>;
111 + pinctrl-names = "default";
112 + pinctrl-0 = <&sdio_pins>;
118 + pinctrl-names = "default";
119 + pinctrl-0 = <&uart0_pins &bt_pins>;
124 + pinctrl-names = "default";
125 + pinctrl-0 = <&uart1_pins>;
130 + pinctrl-names = "default";
131 + pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
132 + cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
135 + compatible = "spidev";
136 + reg = <0>; /* CE0 */
137 + #address-cells = <1>;
139 + spi-max-frequency = <125000000>;
143 + compatible = "spidev";
144 + reg = <1>; /* CE1 */
145 + #address-cells = <1>;
147 + spi-max-frequency = <125000000>;
152 + clock-frequency = <100000>;
156 + pinctrl-names = "default";
157 + pinctrl-0 = <&i2c1_pins>;
158 + clock-frequency = <100000>;
162 + clock-frequency = <100000>;
166 + pinctrl-names = "default";
167 + pinctrl-0 = <&i2s_pins>;
173 + linux,default-trigger = "actpwr";
174 + gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
179 + hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
183 + pinctrl-names = "default";
184 + pinctrl-0 = <&audio_pins>;
185 + brcm,disable-headphones = <1>;
189 + shutdown-gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
193 + shutdown-gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
197 + gpio = <&gpio 40 GPIO_ACTIVE_HIGH>;
202 + act_led_gpio = <&act_led>,"gpios:4";
203 + act_led_activelow = <&act_led>,"gpios:8";
204 + act_led_trigger = <&act_led>,"linux,default-trigger";
207 --- a/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
208 +++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
212 -#include "bcm2710.dtsi"
213 -#include "bcm2709-rpi.dtsi"
214 -#include "bcm283x-rpi-csi1-2lane.dtsi"
215 -#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
216 -#include "bcm2708-rpi-bt.dtsi"
217 -#include "bcm283x-rpi-cam1-regulator.dtsi"
220 - compatible = "raspberrypi,model-zero-2", "brcm,bcm2837";
221 - model = "Raspberry Pi Zero 2";
224 - bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
235 - spi0_pins: spi0_pins {
236 - brcm,pins = <9 10 11>;
237 - brcm,function = <4>; /* alt0 */
240 - spi0_cs_pins: spi0_cs_pins {
242 - brcm,function = <1>; /* output */
247 - brcm,function = <4>;
252 - brcm,function = <4>;
256 - brcm,pins = <18 19 20 21>;
257 - brcm,function = <4>; /* alt0 */
260 - sdio_pins: sdio_pins {
261 - brcm,pins = <34 35 36 37 38 39>;
262 - brcm,function = <7>; // alt3 = SD1
263 - brcm,pull = <0 2 2 2 2 2>;
268 - brcm,function = <4>; /* alt0:GPCLK2 */
272 - uart0_pins: uart0_pins {
273 - brcm,pins = <30 31 32 33>;
274 - brcm,function = <7>; /* alt3=UART0 */
275 - brcm,pull = <2 0 0 2>; /* up none none up */
278 - uart1_pins: uart1_pins {
284 - audio_pins: audio_pins {
286 - brcm,function = <>;
291 - pinctrl-names = "default";
292 - pinctrl-0 = <&sdio_pins>;
298 - pinctrl-names = "default";
299 - pinctrl-0 = <&uart0_pins &bt_pins>;
304 - pinctrl-names = "default";
305 - pinctrl-0 = <&uart1_pins>;
310 - pinctrl-names = "default";
311 - pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
312 - cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
315 - compatible = "spidev";
316 - reg = <0>; /* CE0 */
317 - #address-cells = <1>;
319 - spi-max-frequency = <125000000>;
323 - compatible = "spidev";
324 - reg = <1>; /* CE1 */
325 - #address-cells = <1>;
327 - spi-max-frequency = <125000000>;
332 - clock-frequency = <100000>;
336 - pinctrl-names = "default";
337 - pinctrl-0 = <&i2c1_pins>;
338 - clock-frequency = <100000>;
342 - clock-frequency = <100000>;
346 - pinctrl-names = "default";
347 - pinctrl-0 = <&i2s_pins>;
353 - linux,default-trigger = "actpwr";
354 - gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
359 - hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
363 - pinctrl-names = "default";
364 - pinctrl-0 = <&audio_pins>;
365 - brcm,disable-headphones = <1>;
369 - shutdown-gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
373 - shutdown-gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
377 - gpio = <&gpio 40 GPIO_ACTIVE_HIGH>;
382 - act_led_gpio = <&act_led>,"gpios:4";
383 - act_led_activelow = <&act_led>,"gpios:8";
384 - act_led_trigger = <&act_led>,"linux,default-trigger";
387 +#include "bcm2710-rpi-zero-2-w.dts"