diff options
| author | Olof Johansson <olof@lixom.net> | 2018-12-03 22:05:34 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-03 22:05:34 +0100 |
| commit | d9536e809801687600a02b9b3fc755e1b3bde1af (patch) | |
| tree | c49a9737bda7aaf849b527cf4dc71a068c92403c | |
| parent | ARM: dts: realview: Fix some more duplicate regulator nodes (diff) | |
| parent | ARM: dts: bcm2837: Fix polarity of wifi reset GPIOs (diff) | |
| download | linux-d9536e809801687600a02b9b3fc755e1b3bde1af.tar.xz linux-d9536e809801687600a02b9b3fc755e1b3bde1af.zip | |
Merge tag 'arm-soc/for-4.20/devicetree-fixes' of https://github.com/Broadcom/stblinux into fixes
This pull request contains Broadcom ARM-based SoCs Device Tree fixes,
please pull the following for 4.20:
- Stefan fixes the polariy of the Wi-Fi reset GPIOs signals which would
break on Raspberry Pi 3B and 3B+
* tag 'arm-soc/for-4.20/devicetree-fixes' of https://github.com/Broadcom/stblinux:
ARM: dts: bcm2837: Fix polarity of wifi reset GPIOs
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts index 4adb85e66be3..93762244be7f 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -31,7 +31,7 @@ wifi_pwrseq: wifi-pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>; + reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>; }; }; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts index c318bcbc6ba7..89e6fd547c75 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -26,7 +26,7 @@ wifi_pwrseq: wifi-pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>; + reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>; }; }; |