ARM: dts: bcm2835-rpi-zero-w: Drop unnecessary pinctrl

There is no need to specify a pinctrl for the reset GPIO. So we better
remove this avoid a potential conflict between pinctrl and pwrseq
after the pinmux driver has been changed to strict:

pinctrl-bcm2835 20200000.gpio: pin gpio41 already requested by wifi-pwrseq;
cannot claim for pinctrl-bcm2835:499
pinctrl-bcm2835 20200000.gpio: pin-41 (pinctrl-bcm2835:499) status -22
pwrseq_simple: probe of wifi-pwrseq failed with error -22

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 5765d3411fd6f2091ae8d597ef8f92d4a0ea6b88..ba0167df6c5fe5a9a11bce1f87ee12f19a3f48df 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -25,8 +25,6 @@ act {
 
        wifi_pwrseq: wifi-pwrseq {
                compatible = "mmc-pwrseq-simple";
-               pinctrl-names = "default";
-               pinctrl-0 = <&wl_on>;
                reset-gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
        };
 };
@@ -98,11 +96,6 @@ &gpio {
                          "SD_DATA3_R";
 
        pinctrl-0 = <&gpioout &alt0>;
-
-       wl_on: wl-on {
-               brcm,pins = <41>;
-               brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-       };
 };
 
 &hdmi {