1 From d06fdceb579a5dcdb1bc864ec7ca4f8a94bc3cab Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Tue, 9 May 2023 13:52:39 +0100
4 Subject: [PATCH] ARM: dts: bcm2711-rpi-ds: Group the common pins
6 Move common pin group declarations into the shared bcm2711-rpi-ds.dtsi.
9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
11 arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 121 -------------------------
12 arch/arm/boot/dts/bcm2711-rpi-400.dts | 121 -------------------------
13 arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 121 -------------------------
14 arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 121 -------------------------
15 arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 121 +++++++++++++++++++++++++
16 5 files changed, 121 insertions(+), 484 deletions(-)
18 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
19 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
24 - spi0_pins: spi0_pins {
25 - brcm,pins = <9 10 11>;
26 - brcm,function = <BCM2835_FSEL_ALT0>;
29 - spi0_cs_pins: spi0_cs_pins {
31 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
34 - spi3_pins: spi3_pins {
35 - brcm,pins = <1 2 3>;
36 - brcm,function = <BCM2835_FSEL_ALT3>;
39 - spi3_cs_pins: spi3_cs_pins {
41 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
44 - spi4_pins: spi4_pins {
45 - brcm,pins = <5 6 7>;
46 - brcm,function = <BCM2835_FSEL_ALT3>;
49 - spi4_cs_pins: spi4_cs_pins {
51 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
54 - spi5_pins: spi5_pins {
55 - brcm,pins = <13 14 15>;
56 - brcm,function = <BCM2835_FSEL_ALT3>;
59 - spi5_cs_pins: spi5_cs_pins {
60 - brcm,pins = <12 26>;
61 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
64 - spi6_pins: spi6_pins {
65 - brcm,pins = <19 20 21>;
66 - brcm,function = <BCM2835_FSEL_ALT3>;
69 - spi6_cs_pins: spi6_cs_pins {
70 - brcm,pins = <18 27>;
71 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
76 - brcm,function = <BCM2835_FSEL_ALT0>;
77 - brcm,pull = <BCM2835_PUD_UP>;
82 - brcm,function = <BCM2835_FSEL_ALT0>;
83 - brcm,pull = <BCM2835_PUD_UP>;
88 - brcm,function = <BCM2835_FSEL_ALT5>;
89 - brcm,pull = <BCM2835_PUD_UP>;
94 - brcm,function = <BCM2835_FSEL_ALT5>;
95 - brcm,pull = <BCM2835_PUD_UP>;
99 - brcm,pins = <12 13>;
100 - brcm,function = <BCM2835_FSEL_ALT5>;
101 - brcm,pull = <BCM2835_PUD_UP>;
105 - brcm,pins = <22 23>;
106 - brcm,function = <BCM2835_FSEL_ALT5>;
107 - brcm,pull = <BCM2835_PUD_UP>;
111 - brcm,pins = <18 19 20 21>;
112 - brcm,function = <BCM2835_FSEL_ALT0>;
115 - sdio_pins: sdio_pins {
116 - brcm,pins = <34 35 36 37 38 39>;
117 - brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
118 - brcm,pull = <0 2 2 2 2 2>;
122 brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
125 brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
126 brcm,pull = <0 2 2 0>;
129 - uart2_pins: uart2_pins {
131 - brcm,function = <BCM2835_FSEL_ALT4>;
135 - uart3_pins: uart3_pins {
137 - brcm,function = <BCM2835_FSEL_ALT4>;
141 - uart4_pins: uart4_pins {
143 - brcm,function = <BCM2835_FSEL_ALT4>;
147 - uart5_pins: uart5_pins {
148 - brcm,pins = <12 13>;
149 - brcm,function = <BCM2835_FSEL_ALT4>;
155 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
156 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
157 @@ -310,103 +310,6 @@
161 - spi0_pins: spi0_pins {
162 - brcm,pins = <9 10 11>;
163 - brcm,function = <BCM2835_FSEL_ALT0>;
166 - spi0_cs_pins: spi0_cs_pins {
168 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
171 - spi3_pins: spi3_pins {
172 - brcm,pins = <1 2 3>;
173 - brcm,function = <BCM2835_FSEL_ALT3>;
176 - spi3_cs_pins: spi3_cs_pins {
177 - brcm,pins = <0 24>;
178 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
181 - spi4_pins: spi4_pins {
182 - brcm,pins = <5 6 7>;
183 - brcm,function = <BCM2835_FSEL_ALT3>;
186 - spi4_cs_pins: spi4_cs_pins {
187 - brcm,pins = <4 25>;
188 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
191 - spi5_pins: spi5_pins {
192 - brcm,pins = <13 14 15>;
193 - brcm,function = <BCM2835_FSEL_ALT3>;
196 - spi5_cs_pins: spi5_cs_pins {
197 - brcm,pins = <12 26>;
198 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
201 - spi6_pins: spi6_pins {
202 - brcm,pins = <19 20 21>;
203 - brcm,function = <BCM2835_FSEL_ALT3>;
206 - spi6_cs_pins: spi6_cs_pins {
207 - brcm,pins = <18 27>;
208 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
213 - brcm,function = <BCM2835_FSEL_ALT0>;
214 - brcm,pull = <BCM2835_PUD_UP>;
219 - brcm,function = <BCM2835_FSEL_ALT0>;
220 - brcm,pull = <BCM2835_PUD_UP>;
225 - brcm,function = <BCM2835_FSEL_ALT5>;
226 - brcm,pull = <BCM2835_PUD_UP>;
231 - brcm,function = <BCM2835_FSEL_ALT5>;
232 - brcm,pull = <BCM2835_PUD_UP>;
236 - brcm,pins = <12 13>;
237 - brcm,function = <BCM2835_FSEL_ALT5>;
238 - brcm,pull = <BCM2835_PUD_UP>;
242 - brcm,pins = <22 23>;
243 - brcm,function = <BCM2835_FSEL_ALT5>;
244 - brcm,pull = <BCM2835_PUD_UP>;
248 - brcm,pins = <18 19 20 21>;
249 - brcm,function = <BCM2835_FSEL_ALT0>;
252 - sdio_pins: sdio_pins {
253 - brcm,pins = <34 35 36 37 38 39>;
254 - brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
255 - brcm,pull = <0 2 2 2 2 2>;
259 brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
262 brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
263 brcm,pull = <0 2 2 0>;
266 - uart2_pins: uart2_pins {
268 - brcm,function = <BCM2835_FSEL_ALT4>;
272 - uart3_pins: uart3_pins {
274 - brcm,function = <BCM2835_FSEL_ALT4>;
278 - uart4_pins: uart4_pins {
280 - brcm,function = <BCM2835_FSEL_ALT4>;
284 - uart5_pins: uart5_pins {
285 - brcm,pins = <12 13>;
286 - brcm,function = <BCM2835_FSEL_ALT4>;
292 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
293 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
294 @@ -319,103 +319,6 @@
298 - spi0_pins: spi0_pins {
299 - brcm,pins = <9 10 11>;
300 - brcm,function = <BCM2835_FSEL_ALT0>;
303 - spi0_cs_pins: spi0_cs_pins {
305 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
308 - spi3_pins: spi3_pins {
309 - brcm,pins = <1 2 3>;
310 - brcm,function = <BCM2835_FSEL_ALT3>;
313 - spi3_cs_pins: spi3_cs_pins {
314 - brcm,pins = <0 24>;
315 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
318 - spi4_pins: spi4_pins {
319 - brcm,pins = <5 6 7>;
320 - brcm,function = <BCM2835_FSEL_ALT3>;
323 - spi4_cs_pins: spi4_cs_pins {
324 - brcm,pins = <4 25>;
325 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
328 - spi5_pins: spi5_pins {
329 - brcm,pins = <13 14 15>;
330 - brcm,function = <BCM2835_FSEL_ALT3>;
333 - spi5_cs_pins: spi5_cs_pins {
334 - brcm,pins = <12 26>;
335 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
338 - spi6_pins: spi6_pins {
339 - brcm,pins = <19 20 21>;
340 - brcm,function = <BCM2835_FSEL_ALT3>;
343 - spi6_cs_pins: spi6_cs_pins {
344 - brcm,pins = <18 27>;
345 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
350 - brcm,function = <BCM2835_FSEL_ALT0>;
351 - brcm,pull = <BCM2835_PUD_UP>;
356 - brcm,function = <BCM2835_FSEL_ALT0>;
357 - brcm,pull = <BCM2835_PUD_UP>;
362 - brcm,function = <BCM2835_FSEL_ALT5>;
363 - brcm,pull = <BCM2835_PUD_UP>;
368 - brcm,function = <BCM2835_FSEL_ALT5>;
369 - brcm,pull = <BCM2835_PUD_UP>;
373 - brcm,pins = <12 13>;
374 - brcm,function = <BCM2835_FSEL_ALT5>;
375 - brcm,pull = <BCM2835_PUD_UP>;
379 - brcm,pins = <22 23>;
380 - brcm,function = <BCM2835_FSEL_ALT5>;
381 - brcm,pull = <BCM2835_PUD_UP>;
385 - brcm,pins = <18 19 20 21>;
386 - brcm,function = <BCM2835_FSEL_ALT0>;
389 - sdio_pins: sdio_pins {
390 - brcm,pins = <34 35 36 37 38 39>;
391 - brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
392 - brcm,pull = <0 2 2 2 2 2>;
396 brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
399 brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
400 brcm,pull = <0 2 2 0>;
403 - uart2_pins: uart2_pins {
405 - brcm,function = <BCM2835_FSEL_ALT4>;
409 - uart3_pins: uart3_pins {
411 - brcm,function = <BCM2835_FSEL_ALT4>;
415 - uart4_pins: uart4_pins {
417 - brcm,function = <BCM2835_FSEL_ALT4>;
421 - uart5_pins: uart5_pins {
422 - brcm,pins = <12 13>;
423 - brcm,function = <BCM2835_FSEL_ALT4>;
429 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
430 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
431 @@ -200,132 +200,11 @@
435 - spi0_pins: spi0_pins {
436 - brcm,pins = <9 10 11>;
437 - brcm,function = <BCM2835_FSEL_ALT0>;
440 - spi0_cs_pins: spi0_cs_pins {
442 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
445 - spi3_pins: spi3_pins {
446 - brcm,pins = <1 2 3>;
447 - brcm,function = <BCM2835_FSEL_ALT3>;
450 - spi3_cs_pins: spi3_cs_pins {
451 - brcm,pins = <0 24>;
452 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
455 - spi4_pins: spi4_pins {
456 - brcm,pins = <5 6 7>;
457 - brcm,function = <BCM2835_FSEL_ALT3>;
460 - spi4_cs_pins: spi4_cs_pins {
461 - brcm,pins = <4 25>;
462 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
465 - spi5_pins: spi5_pins {
466 - brcm,pins = <13 14 15>;
467 - brcm,function = <BCM2835_FSEL_ALT3>;
470 - spi5_cs_pins: spi5_cs_pins {
471 - brcm,pins = <12 26>;
472 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
475 - spi6_pins: spi6_pins {
476 - brcm,pins = <19 20 21>;
477 - brcm,function = <BCM2835_FSEL_ALT3>;
480 - spi6_cs_pins: spi6_cs_pins {
481 - brcm,pins = <18 27>;
482 - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
487 - brcm,function = <BCM2835_FSEL_ALT0>;
488 - brcm,pull = <BCM2835_PUD_UP>;
493 - brcm,function = <BCM2835_FSEL_ALT0>;
494 - brcm,pull = <BCM2835_PUD_UP>;
499 - brcm,function = <BCM2835_FSEL_ALT5>;
500 - brcm,pull = <BCM2835_PUD_UP>;
505 - brcm,function = <BCM2835_FSEL_ALT5>;
506 - brcm,pull = <BCM2835_PUD_UP>;
510 - brcm,pins = <12 13>;
511 - brcm,function = <BCM2835_FSEL_ALT5>;
512 - brcm,pull = <BCM2835_PUD_UP>;
516 - brcm,pins = <22 23>;
517 - brcm,function = <BCM2835_FSEL_ALT5>;
518 - brcm,pull = <BCM2835_PUD_UP>;
522 - brcm,pins = <18 19 20 21>;
523 - brcm,function = <BCM2835_FSEL_ALT0>;
526 - sdio_pins: sdio_pins {
527 - brcm,pins = <34 35 36 37 38 39>;
528 - brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
529 - brcm,pull = <0 2 2 2 2 2>;
532 uart0_pins: uart0_pins {
538 - uart2_pins: uart2_pins {
540 - brcm,function = <BCM2835_FSEL_ALT4>;
544 - uart3_pins: uart3_pins {
546 - brcm,function = <BCM2835_FSEL_ALT4>;
550 - uart4_pins: uart4_pins {
552 - brcm,function = <BCM2835_FSEL_ALT4>;
556 - uart5_pins: uart5_pins {
557 - brcm,pins = <12 13>;
558 - brcm,function = <BCM2835_FSEL_ALT4>;
564 --- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
565 +++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
566 @@ -171,6 +171,127 @@
568 interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
569 <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
571 + spi0_pins: spi0_pins {
572 + brcm,pins = <9 10 11>;
573 + brcm,function = <BCM2835_FSEL_ALT0>;
576 + spi0_cs_pins: spi0_cs_pins {
578 + brcm,function = <BCM2835_FSEL_GPIO_OUT>;
581 + spi3_pins: spi3_pins {
582 + brcm,pins = <1 2 3>;
583 + brcm,function = <BCM2835_FSEL_ALT3>;
586 + spi3_cs_pins: spi3_cs_pins {
587 + brcm,pins = <0 24>;
588 + brcm,function = <BCM2835_FSEL_GPIO_OUT>;
591 + spi4_pins: spi4_pins {
592 + brcm,pins = <5 6 7>;
593 + brcm,function = <BCM2835_FSEL_ALT3>;
596 + spi4_cs_pins: spi4_cs_pins {
597 + brcm,pins = <4 25>;
598 + brcm,function = <BCM2835_FSEL_GPIO_OUT>;
601 + spi5_pins: spi5_pins {
602 + brcm,pins = <13 14 15>;
603 + brcm,function = <BCM2835_FSEL_ALT3>;
606 + spi5_cs_pins: spi5_cs_pins {
607 + brcm,pins = <12 26>;
608 + brcm,function = <BCM2835_FSEL_GPIO_OUT>;
611 + spi6_pins: spi6_pins {
612 + brcm,pins = <19 20 21>;
613 + brcm,function = <BCM2835_FSEL_ALT3>;
616 + spi6_cs_pins: spi6_cs_pins {
617 + brcm,pins = <18 27>;
618 + brcm,function = <BCM2835_FSEL_GPIO_OUT>;
623 + brcm,function = <BCM2835_FSEL_ALT0>;
624 + brcm,pull = <BCM2835_PUD_UP>;
629 + brcm,function = <BCM2835_FSEL_ALT0>;
630 + brcm,pull = <BCM2835_PUD_UP>;
635 + brcm,function = <BCM2835_FSEL_ALT5>;
636 + brcm,pull = <BCM2835_PUD_UP>;
641 + brcm,function = <BCM2835_FSEL_ALT5>;
642 + brcm,pull = <BCM2835_PUD_UP>;
646 + brcm,pins = <12 13>;
647 + brcm,function = <BCM2835_FSEL_ALT5>;
648 + brcm,pull = <BCM2835_PUD_UP>;
652 + brcm,pins = <22 23>;
653 + brcm,function = <BCM2835_FSEL_ALT5>;
654 + brcm,pull = <BCM2835_PUD_UP>;
658 + brcm,pins = <18 19 20 21>;
659 + brcm,function = <BCM2835_FSEL_ALT0>;
662 + sdio_pins: sdio_pins {
663 + brcm,pins = <34 35 36 37 38 39>;
664 + brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
665 + brcm,pull = <0 2 2 2 2 2>;
668 + uart2_pins: uart2_pins {
670 + brcm,function = <BCM2835_FSEL_ALT4>;
674 + uart3_pins: uart3_pins {
676 + brcm,function = <BCM2835_FSEL_ALT4>;
680 + uart4_pins: uart4_pins {
682 + brcm,function = <BCM2835_FSEL_ALT4>;
686 + uart5_pins: uart5_pins {
687 + brcm,pins = <12 13>;
688 + brcm,function = <BCM2835_FSEL_ALT4>;