From d06fdceb579a5dcdb1bc864ec7ca4f8a94bc3cab Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 9 May 2023 13:52:39 +0100 Subject: [PATCH] ARM: dts: bcm2711-rpi-ds: Group the common pins Move common pin group declarations into the shared bcm2711-rpi-ds.dtsi. No functional change. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 121 ------------------------- arch/arm/boot/dts/bcm2711-rpi-400.dts | 121 ------------------------- arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 121 ------------------------- arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 121 ------------------------- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 121 +++++++++++++++++++++++++ 5 files changed, 121 insertions(+), 484 deletions(-) --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -310,103 +310,6 @@ }; &gpio { - spi0_pins: spi0_pins { - brcm,pins = <9 10 11>; - brcm,function = ; - }; - - spi0_cs_pins: spi0_cs_pins { - brcm,pins = <8 7>; - brcm,function = ; - }; - - spi3_pins: spi3_pins { - brcm,pins = <1 2 3>; - brcm,function = ; - }; - - spi3_cs_pins: spi3_cs_pins { - brcm,pins = <0 24>; - brcm,function = ; - }; - - spi4_pins: spi4_pins { - brcm,pins = <5 6 7>; - brcm,function = ; - }; - - spi4_cs_pins: spi4_cs_pins { - brcm,pins = <4 25>; - brcm,function = ; - }; - - spi5_pins: spi5_pins { - brcm,pins = <13 14 15>; - brcm,function = ; - }; - - spi5_cs_pins: spi5_cs_pins { - brcm,pins = <12 26>; - brcm,function = ; - }; - - spi6_pins: spi6_pins { - brcm,pins = <19 20 21>; - brcm,function = ; - }; - - spi6_cs_pins: spi6_cs_pins { - brcm,pins = <18 27>; - brcm,function = ; - }; - - i2c0_pins: i2c0 { - brcm,pins = <0 1>; - brcm,function = ; - brcm,pull = ; - }; - - i2c1_pins: i2c1 { - brcm,pins = <2 3>; - brcm,function = ; - brcm,pull = ; - }; - - i2c3_pins: i2c3 { - brcm,pins = <4 5>; - brcm,function = ; - brcm,pull = ; - }; - - i2c4_pins: i2c4 { - brcm,pins = <8 9>; - brcm,function = ; - brcm,pull = ; - }; - - i2c5_pins: i2c5 { - brcm,pins = <12 13>; - brcm,function = ; - brcm,pull = ; - }; - - i2c6_pins: i2c6 { - brcm,pins = <22 23>; - brcm,function = ; - brcm,pull = ; - }; - - i2s_pins: i2s { - brcm,pins = <18 19 20 21>; - brcm,function = ; - }; - - sdio_pins: sdio_pins { - brcm,pins = <34 35 36 37 38 39>; - brcm,function = ; // alt3 = SD1 - brcm,pull = <0 2 2 2 2 2>; - }; - bt_pins: bt_pins { brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0 // to fool pinctrl @@ -431,30 +334,6 @@ brcm,function = ; /* alt5=UART1 */ brcm,pull = <0 2 2 0>; }; - - uart2_pins: uart2_pins { - brcm,pins = <0 1>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart3_pins: uart3_pins { - brcm,pins = <4 5>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart4_pins: uart4_pins { - brcm,pins = <8 9>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart5_pins: uart5_pins { - brcm,pins = <12 13>; - brcm,function = ; - brcm,pull = <0 2>; - }; }; &i2c0if { --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts @@ -310,103 +310,6 @@ }; &gpio { - spi0_pins: spi0_pins { - brcm,pins = <9 10 11>; - brcm,function = ; - }; - - spi0_cs_pins: spi0_cs_pins { - brcm,pins = <8 7>; - brcm,function = ; - }; - - spi3_pins: spi3_pins { - brcm,pins = <1 2 3>; - brcm,function = ; - }; - - spi3_cs_pins: spi3_cs_pins { - brcm,pins = <0 24>; - brcm,function = ; - }; - - spi4_pins: spi4_pins { - brcm,pins = <5 6 7>; - brcm,function = ; - }; - - spi4_cs_pins: spi4_cs_pins { - brcm,pins = <4 25>; - brcm,function = ; - }; - - spi5_pins: spi5_pins { - brcm,pins = <13 14 15>; - brcm,function = ; - }; - - spi5_cs_pins: spi5_cs_pins { - brcm,pins = <12 26>; - brcm,function = ; - }; - - spi6_pins: spi6_pins { - brcm,pins = <19 20 21>; - brcm,function = ; - }; - - spi6_cs_pins: spi6_cs_pins { - brcm,pins = <18 27>; - brcm,function = ; - }; - - i2c0_pins: i2c0 { - brcm,pins = <0 1>; - brcm,function = ; - brcm,pull = ; - }; - - i2c1_pins: i2c1 { - brcm,pins = <2 3>; - brcm,function = ; - brcm,pull = ; - }; - - i2c3_pins: i2c3 { - brcm,pins = <4 5>; - brcm,function = ; - brcm,pull = ; - }; - - i2c4_pins: i2c4 { - brcm,pins = <8 9>; - brcm,function = ; - brcm,pull = ; - }; - - i2c5_pins: i2c5 { - brcm,pins = <12 13>; - brcm,function = ; - brcm,pull = ; - }; - - i2c6_pins: i2c6 { - brcm,pins = <22 23>; - brcm,function = ; - brcm,pull = ; - }; - - i2s_pins: i2s { - brcm,pins = <18 19 20 21>; - brcm,function = ; - }; - - sdio_pins: sdio_pins { - brcm,pins = <34 35 36 37 38 39>; - brcm,function = ; // alt3 = SD1 - brcm,pull = <0 2 2 2 2 2>; - }; - bt_pins: bt_pins { brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0 // to fool pinctrl @@ -431,30 +334,6 @@ brcm,function = ; /* alt5=UART1 */ brcm,pull = <0 2 2 0>; }; - - uart2_pins: uart2_pins { - brcm,pins = <0 1>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart3_pins: uart3_pins { - brcm,pins = <4 5>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart4_pins: uart4_pins { - brcm,pins = <8 9>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart5_pins: uart5_pins { - brcm,pins = <12 13>; - brcm,function = ; - brcm,pull = <0 2>; - }; }; &i2c0if { --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -319,103 +319,6 @@ }; &gpio { - spi0_pins: spi0_pins { - brcm,pins = <9 10 11>; - brcm,function = ; - }; - - spi0_cs_pins: spi0_cs_pins { - brcm,pins = <8 7>; - brcm,function = ; - }; - - spi3_pins: spi3_pins { - brcm,pins = <1 2 3>; - brcm,function = ; - }; - - spi3_cs_pins: spi3_cs_pins { - brcm,pins = <0 24>; - brcm,function = ; - }; - - spi4_pins: spi4_pins { - brcm,pins = <5 6 7>; - brcm,function = ; - }; - - spi4_cs_pins: spi4_cs_pins { - brcm,pins = <4 25>; - brcm,function = ; - }; - - spi5_pins: spi5_pins { - brcm,pins = <13 14 15>; - brcm,function = ; - }; - - spi5_cs_pins: spi5_cs_pins { - brcm,pins = <12 26>; - brcm,function = ; - }; - - spi6_pins: spi6_pins { - brcm,pins = <19 20 21>; - brcm,function = ; - }; - - spi6_cs_pins: spi6_cs_pins { - brcm,pins = <18 27>; - brcm,function = ; - }; - - i2c0_pins: i2c0 { - brcm,pins = <0 1>; - brcm,function = ; - brcm,pull = ; - }; - - i2c1_pins: i2c1 { - brcm,pins = <2 3>; - brcm,function = ; - brcm,pull = ; - }; - - i2c3_pins: i2c3 { - brcm,pins = <4 5>; - brcm,function = ; - brcm,pull = ; - }; - - i2c4_pins: i2c4 { - brcm,pins = <8 9>; - brcm,function = ; - brcm,pull = ; - }; - - i2c5_pins: i2c5 { - brcm,pins = <12 13>; - brcm,function = ; - brcm,pull = ; - }; - - i2c6_pins: i2c6 { - brcm,pins = <22 23>; - brcm,function = ; - brcm,pull = ; - }; - - i2s_pins: i2s { - brcm,pins = <18 19 20 21>; - brcm,function = ; - }; - - sdio_pins: sdio_pins { - brcm,pins = <34 35 36 37 38 39>; - brcm,function = ; // alt3 = SD1 - brcm,pull = <0 2 2 2 2 2>; - }; - bt_pins: bt_pins { brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0 // to fool pinctrl @@ -440,30 +343,6 @@ brcm,function = ; /* alt5=UART1 */ brcm,pull = <0 2 2 0>; }; - - uart2_pins: uart2_pins { - brcm,pins = <0 1>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart3_pins: uart3_pins { - brcm,pins = <4 5>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart4_pins: uart4_pins { - brcm,pins = <8 9>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart5_pins: uart5_pins { - brcm,pins = <12 13>; - brcm,function = ; - brcm,pull = <0 2>; - }; }; &i2c0if { --- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts @@ -200,132 +200,11 @@ }; &gpio { - spi0_pins: spi0_pins { - brcm,pins = <9 10 11>; - brcm,function = ; - }; - - spi0_cs_pins: spi0_cs_pins { - brcm,pins = <8 7>; - brcm,function = ; - }; - - spi3_pins: spi3_pins { - brcm,pins = <1 2 3>; - brcm,function = ; - }; - - spi3_cs_pins: spi3_cs_pins { - brcm,pins = <0 24>; - brcm,function = ; - }; - - spi4_pins: spi4_pins { - brcm,pins = <5 6 7>; - brcm,function = ; - }; - - spi4_cs_pins: spi4_cs_pins { - brcm,pins = <4 25>; - brcm,function = ; - }; - - spi5_pins: spi5_pins { - brcm,pins = <13 14 15>; - brcm,function = ; - }; - - spi5_cs_pins: spi5_cs_pins { - brcm,pins = <12 26>; - brcm,function = ; - }; - - spi6_pins: spi6_pins { - brcm,pins = <19 20 21>; - brcm,function = ; - }; - - spi6_cs_pins: spi6_cs_pins { - brcm,pins = <18 27>; - brcm,function = ; - }; - - i2c0_pins: i2c0 { - brcm,pins = <0 1>; - brcm,function = ; - brcm,pull = ; - }; - - i2c1_pins: i2c1 { - brcm,pins = <2 3>; - brcm,function = ; - brcm,pull = ; - }; - - i2c3_pins: i2c3 { - brcm,pins = <4 5>; - brcm,function = ; - brcm,pull = ; - }; - - i2c4_pins: i2c4 { - brcm,pins = <8 9>; - brcm,function = ; - brcm,pull = ; - }; - - i2c5_pins: i2c5 { - brcm,pins = <12 13>; - brcm,function = ; - brcm,pull = ; - }; - - i2c6_pins: i2c6 { - brcm,pins = <22 23>; - brcm,function = ; - brcm,pull = ; - }; - - i2s_pins: i2s { - brcm,pins = <18 19 20 21>; - brcm,function = ; - }; - - sdio_pins: sdio_pins { - brcm,pins = <34 35 36 37 38 39>; - brcm,function = ; // alt3 = SD1 - brcm,pull = <0 2 2 2 2 2>; - }; - uart0_pins: uart0_pins { brcm,pins; brcm,function; brcm,pull; }; - - uart2_pins: uart2_pins { - brcm,pins = <0 1>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart3_pins: uart3_pins { - brcm,pins = <4 5>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart4_pins: uart4_pins { - brcm,pins = <8 9>; - brcm,function = ; - brcm,pull = <0 2>; - }; - - uart5_pins: uart5_pins { - brcm,pins = <12 13>; - brcm,function = ; - brcm,pull = <0 2>; - }; }; &i2c0if { --- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi @@ -171,6 +171,127 @@ &gpio { interrupts = , ; + + spi0_pins: spi0_pins { + brcm,pins = <9 10 11>; + brcm,function = ; + }; + + spi0_cs_pins: spi0_cs_pins { + brcm,pins = <8 7>; + brcm,function = ; + }; + + spi3_pins: spi3_pins { + brcm,pins = <1 2 3>; + brcm,function = ; + }; + + spi3_cs_pins: spi3_cs_pins { + brcm,pins = <0 24>; + brcm,function = ; + }; + + spi4_pins: spi4_pins { + brcm,pins = <5 6 7>; + brcm,function = ; + }; + + spi4_cs_pins: spi4_cs_pins { + brcm,pins = <4 25>; + brcm,function = ; + }; + + spi5_pins: spi5_pins { + brcm,pins = <13 14 15>; + brcm,function = ; + }; + + spi5_cs_pins: spi5_cs_pins { + brcm,pins = <12 26>; + brcm,function = ; + }; + + spi6_pins: spi6_pins { + brcm,pins = <19 20 21>; + brcm,function = ; + }; + + spi6_cs_pins: spi6_cs_pins { + brcm,pins = <18 27>; + brcm,function = ; + }; + + i2c0_pins: i2c0 { + brcm,pins = <0 1>; + brcm,function = ; + brcm,pull = ; + }; + + i2c1_pins: i2c1 { + brcm,pins = <2 3>; + brcm,function = ; + brcm,pull = ; + }; + + i2c3_pins: i2c3 { + brcm,pins = <4 5>; + brcm,function = ; + brcm,pull = ; + }; + + i2c4_pins: i2c4 { + brcm,pins = <8 9>; + brcm,function = ; + brcm,pull = ; + }; + + i2c5_pins: i2c5 { + brcm,pins = <12 13>; + brcm,function = ; + brcm,pull = ; + }; + + i2c6_pins: i2c6 { + brcm,pins = <22 23>; + brcm,function = ; + brcm,pull = ; + }; + + i2s_pins: i2s { + brcm,pins = <18 19 20 21>; + brcm,function = ; + }; + + sdio_pins: sdio_pins { + brcm,pins = <34 35 36 37 38 39>; + brcm,function = ; // alt3 = SD1 + brcm,pull = <0 2 2 2 2 2>; + }; + + uart2_pins: uart2_pins { + brcm,pins = <0 1>; + brcm,function = ; + brcm,pull = <0 2>; + }; + + uart3_pins: uart3_pins { + brcm,pins = <4 5>; + brcm,function = ; + brcm,pull = <0 2>; + }; + + uart4_pins: uart4_pins { + brcm,pins = <8 9>; + brcm,function = ; + brcm,pull = <0 2>; + }; + + uart5_pins: uart5_pins { + brcm,pins = <12 13>; + brcm,function = ; + brcm,pull = <0 2>; + }; }; &emmc2 {