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>

diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index f7f9db355d9818751d05e67d162b8251a4a03a9a..21507c922783d57d86d0a2502df5877c873fc856 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -22,7 +22,7 @@
 };
 
 &gpio {
-       pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
+       pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
 
        /* I2S interface */
        i2s_alt0: i2s_alt0 {

diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
index 8be102f5d826c852d1229a0ba60c1473201bc35a..5afba0900449df82624031d4e67664384b548fb1 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -15,7 +15,7 @@
 };
 
 &gpio {
-       pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
+       pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
 
        /* I2S interface */
        i2s_alt2: i2s_alt2 {

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index 35cde65c975ec439f027d9bd533f2012b9b9a0ab..38f66aa244fef3f82862863a76d0aa3ffd71745a 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -23,7 +23,7 @@
 };
 
 &gpio {
-       pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
+       pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
 
        /* I2S interface */
        i2s_alt0: i2s_alt0 {

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
index 84df85ea6296d8c8a90d181580d882568c69cb34..75e045aba7cee7e1173f47c3b2f65a33a896988f 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -16,7 +16,7 @@
 };
 
 &gpio {
-       pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
+       pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
 
        /* I2S interface */
        i2s_alt2: i2s_alt2 {

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 8e626a80fe243d4dc47b461c3a5214dcf34e5ce9..76a254b3219a9ffbaccb1a4a4e955175efae6981 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -16,7 +16,7 @@
 };
 
 &gpio {
-       pinctrl-0 = <&gpioout &alt0 &alt3>;
+       pinctrl-0 = <&gpioout &alt0>;
 };
 
 &hdmi {

diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
index 60e359fafc5b4233eaf4486e8d934d7c8e28a605..7c1c18048948bf1e7de448e7ce89495cd6c4ecdd 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
@@ -26,7 +26,7 @@
 };
 
 &gpio {
-       pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
+       pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
 
        /* I2S interface */
        i2s_alt0: i2s_alt0 {

diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index 7c63e667425f1654e1025d2d99d9bd96c8230cfb..6ddf7dfe3f7202642cc4d595ff4763f91248c0a5 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -42,11 +42,6 @@
                brcm,pins = <4 5 7 8 9 10 11 14 15>;
                brcm,function = <BCM2835_FSEL_ALT0>;
        };
-
-       alt3: alt3 {
-               brcm,pins = <>;
-               brcm,function = <BCM2835_FSEL_ALT3>;
-       };
 };
 
 &i2c0 {

diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index 39dccf62ac96eeb6de8a0368d0eedea52ea77869..bf19e8cfb9e63cc9cd0a1c26e69a286b9a3c4bdf 100644 (file)
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -27,7 +27,7 @@
 };
 
 &gpio {
-       pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
+       pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
 
        /* I2S interface */
        i2s_alt0: i2s_alt0 {