| Message ID | 1548003960-4807-1-git-send-email-stefan.wahren@i2se.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | ab1b4ef966af90ad79fa3c4c124e47915cddde10 |
| Headers | show |
| Series | ARM: dts: bcm2835-rpi-zero-w: Drop unnecessary pinctrl | expand |
Stefan Wahren <stefan.wahren@i2se.com> writes: > 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>
Am 21.01.19 um 21:29 schrieb Eric Anholt: > Stefan Wahren <stefan.wahren@i2se.com> writes: > >> 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> Applied to bcm2835-dt-next Thanks
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts index 644d907..6071213 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -25,8 +25,6 @@ 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 @@ "SD_DATA3_R"; pinctrl-0 = <&gpioout &alt0>; - - wl_on: wl-on { - brcm,pins = <41>; - brcm,function = <BCM2835_FSEL_GPIO_OUT>; - }; }; &hdmi {
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> --- arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 7 ------- 1 file changed, 7 deletions(-)