1 From 9542646d9211ab4305beb75da97f61cc1968ae6c Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Tue, 28 May 2019 16:36:04 +0100
4 Subject: [PATCH 507/806] BCM270X_DT: Rename Pi Zero W DT files
6 The downtream Pi Zero W dts file uses the digit 0, whereas upstream
7 chose to spell it out - "zero-w". The firmware has, for a long time,
8 looked for bcm2708-rpi-zero-w.dtb first before falling back to the
9 numerical version. Therefore it is better to follow upstream and
10 make the switch to "bcm2708-rpi-zero-w".
12 At the same time, remove some overrides that duplicate values
13 inherited from the shared .dtsi files.
15 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
17 arch/arm/boot/dts/Makefile | 2 +-
18 .../boot/dts/{bcm2708-rpi-0-w.dts => bcm2708-rpi-zero-w.dts} | 5 -----
19 2 files changed, 1 insertion(+), 6 deletions(-)
20 rename arch/arm/boot/dts/{bcm2708-rpi-0-w.dts => bcm2708-rpi-zero-w.dts} (97%)
22 --- a/arch/arm/boot/dts/Makefile
23 +++ b/arch/arm/boot/dts/Makefile
24 @@ -4,7 +4,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
26 bcm2708-rpi-b-plus.dtb \
28 - bcm2708-rpi-0-w.dtb \
29 + bcm2708-rpi-zero-w.dtb \
32 bcm2710-rpi-3-b-plus.dtb \
33 --- a/arch/arm/boot/dts/bcm2708-rpi-0-w.dts
38 -#include "bcm2708.dtsi"
39 -#include "bcm283x-rpi-csi1-2lane.dtsi"
42 - compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
43 - model = "Raspberry Pi Zero W";
46 - bootargs = "coherent_pool=1M 8250.nr_uarts=1";
57 - spi0_pins: spi0_pins {
58 - brcm,pins = <9 10 11>;
59 - brcm,function = <4>; /* alt0 */
62 - spi0_cs_pins: spi0_cs_pins {
64 - brcm,function = <1>; /* output */
69 - brcm,function = <4>;
74 - brcm,function = <4>;
78 - brcm,pins = <18 19 20 21>;
79 - brcm,function = <4>; /* alt0 */
82 - sdio_pins: sdio_pins {
83 - brcm,pins = <34 35 36 37 38 39>;
84 - brcm,function = <7>; /* ALT3 = SD1 */
85 - brcm,pull = <0 2 2 2 2 2>;
90 - brcm,function = <4>; /* alt0:GPCLK2 */
91 - brcm,pull = <0>; /* none */
94 - uart0_pins: uart0_pins {
95 - brcm,pins = <30 31 32 33>;
96 - brcm,function = <7>; /* alt3=UART0 */
97 - brcm,pull = <2 0 0 2>; /* up none none up */
100 - uart1_pins: uart1_pins {
106 - audio_pins: audio_pins {
108 - brcm,function = <>;
113 - pinctrl-names = "default";
114 - pinctrl-0 = <&sdio_pins>;
120 - pinctrl-names = "default";
121 - pinctrl-0 = <&uart0_pins &bt_pins>;
126 - pinctrl-names = "default";
127 - pinctrl-0 = <&uart1_pins>;
132 - pinctrl-names = "default";
133 - pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
134 - cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
137 - compatible = "spidev";
138 - reg = <0>; /* CE0 */
139 - #address-cells = <1>;
141 - spi-max-frequency = <125000000>;
145 - compatible = "spidev";
146 - reg = <1>; /* CE1 */
147 - #address-cells = <1>;
149 - spi-max-frequency = <125000000>;
154 - pinctrl-names = "default";
155 - pinctrl-0 = <&i2c0_pins>;
156 - clock-frequency = <100000>;
160 - pinctrl-names = "default";
161 - pinctrl-0 = <&i2c1_pins>;
162 - clock-frequency = <100000>;
166 - clock-frequency = <100000>;
170 - #sound-dai-cells = <0>;
171 - pinctrl-names = "default";
172 - pinctrl-0 = <&i2s_pins>;
182 - linux,default-trigger = "mmc0";
183 - gpios = <&gpio 47 0>;
188 - hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
192 - pinctrl-names = "default";
193 - pinctrl-0 = <&audio_pins>;
198 - act_led_gpio = <&act_led>,"gpios:4";
199 - act_led_activelow = <&act_led>,"gpios:8";
200 - act_led_trigger = <&act_led>,"linux,default-trigger";
204 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
208 +#include "bcm2708.dtsi"
209 +#include "bcm283x-rpi-csi1-2lane.dtsi"
212 + compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
213 + model = "Raspberry Pi Zero W";
216 + bootargs = "coherent_pool=1M 8250.nr_uarts=1";
227 + spi0_pins: spi0_pins {
228 + brcm,pins = <9 10 11>;
229 + brcm,function = <4>; /* alt0 */
232 + spi0_cs_pins: spi0_cs_pins {
234 + brcm,function = <1>; /* output */
239 + brcm,function = <4>;
244 + brcm,function = <4>;
248 + brcm,pins = <18 19 20 21>;
249 + brcm,function = <4>; /* alt0 */
252 + sdio_pins: sdio_pins {
253 + brcm,pins = <34 35 36 37 38 39>;
254 + brcm,function = <7>; /* ALT3 = SD1 */
255 + brcm,pull = <0 2 2 2 2 2>;
260 + brcm,function = <4>; /* alt0:GPCLK2 */
261 + brcm,pull = <0>; /* none */
264 + uart0_pins: uart0_pins {
265 + brcm,pins = <30 31 32 33>;
266 + brcm,function = <7>; /* alt3=UART0 */
267 + brcm,pull = <2 0 0 2>; /* up none none up */
270 + uart1_pins: uart1_pins {
276 + audio_pins: audio_pins {
278 + brcm,function = <>;
283 + pinctrl-names = "default";
284 + pinctrl-0 = <&sdio_pins>;
290 + pinctrl-names = "default";
291 + pinctrl-0 = <&uart0_pins &bt_pins>;
296 + pinctrl-names = "default";
297 + pinctrl-0 = <&uart1_pins>;
302 + pinctrl-names = "default";
303 + pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
304 + cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
307 + compatible = "spidev";
308 + reg = <0>; /* CE0 */
309 + #address-cells = <1>;
311 + spi-max-frequency = <125000000>;
315 + compatible = "spidev";
316 + reg = <1>; /* CE1 */
317 + #address-cells = <1>;
319 + spi-max-frequency = <125000000>;
324 + pinctrl-names = "default";
325 + pinctrl-0 = <&i2c0_pins>;
326 + clock-frequency = <100000>;
330 + pinctrl-names = "default";
331 + pinctrl-0 = <&i2c1_pins>;
332 + clock-frequency = <100000>;
336 + clock-frequency = <100000>;
340 + pinctrl-names = "default";
341 + pinctrl-0 = <&i2s_pins>;
347 + linux,default-trigger = "mmc0";
348 + gpios = <&gpio 47 0>;
353 + hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
357 + pinctrl-names = "default";
358 + pinctrl-0 = <&audio_pins>;
363 + act_led_gpio = <&act_led>,"gpios:4";
364 + act_led_activelow = <&act_led>,"gpios:8";
365 + act_led_trigger = <&act_led>,"linux,default-trigger";