tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: bcm283x: drop alt3 from &gpio

As the alt3 group has no pins left drop it from &gpio.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>

authored by

Gerd Hoffmann and committed by
Eric Anholt a6d962ae f8bef361

+7 -12
+1 -1
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
··· 22 22 }; 23 23 24 24 &gpio { 25 - pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>; 25 + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; 26 26 27 27 /* I2S interface */ 28 28 i2s_alt0: i2s_alt0 {
+1 -1
arch/arm/boot/dts/bcm2835-rpi-a.dts
··· 15 15 }; 16 16 17 17 &gpio { 18 - pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>; 18 + pinctrl-0 = <&gpioout &alt0 &i2s_alt2>; 19 19 20 20 /* I2S interface */ 21 21 i2s_alt2: i2s_alt2 {
+1 -1
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
··· 23 23 }; 24 24 25 25 &gpio { 26 - pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>; 26 + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; 27 27 28 28 /* I2S interface */ 29 29 i2s_alt0: i2s_alt0 {
+1 -1
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
··· 16 16 }; 17 17 18 18 &gpio { 19 - pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>; 19 + pinctrl-0 = <&gpioout &alt0 &i2s_alt2>; 20 20 21 21 /* I2S interface */ 22 22 i2s_alt2: i2s_alt2 {
+1 -1
arch/arm/boot/dts/bcm2835-rpi-b.dts
··· 16 16 }; 17 17 18 18 &gpio { 19 - pinctrl-0 = <&gpioout &alt0 &alt3>; 19 + pinctrl-0 = <&gpioout &alt0>; 20 20 }; 21 21 22 22 &hdmi {
+1 -1
arch/arm/boot/dts/bcm2835-rpi-zero.dts
··· 26 26 }; 27 27 28 28 &gpio { 29 - pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>; 29 + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; 30 30 31 31 /* I2S interface */ 32 32 i2s_alt0: i2s_alt0 {
-5
arch/arm/boot/dts/bcm2835-rpi.dtsi
··· 42 42 brcm,pins = <4 5 7 8 9 10 11 14 15>; 43 43 brcm,function = <BCM2835_FSEL_ALT0>; 44 44 }; 45 - 46 - alt3: alt3 { 47 - brcm,pins = <>; 48 - brcm,function = <BCM2835_FSEL_ALT3>; 49 - }; 50 45 }; 51 46 52 47 &i2c0 {
+1 -1
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
··· 27 27 }; 28 28 29 29 &gpio { 30 - pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>; 30 + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; 31 31 32 32 /* I2S interface */ 33 33 i2s_alt0: i2s_alt0 {