diff options
| author | Olof Johansson <olof@lixom.net> | 2019-10-22 00:25:21 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-10-22 00:25:22 +0300 |
| commit | cc3fafdaf5cba7788c502e1ed0520f06225891b0 (patch) | |
| tree | 3a57d2742523022a375e019abdce64d6bc7cb264 /arch | |
| parent | 6813a9ce1f994b6467cf1dcd99f0f2cbc1d5b00a (diff) | |
| parent | 626c45d223e22090511acbfb481e0ece1de1356d (diff) | |
| download | linux-cc3fafdaf5cba7788c502e1ed0520f06225891b0.tar.xz | |
Merge tag 'arm-soc/for-5.4/devicetree-fixes-part2' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM-based SoC Device Tree fixes for
5.4, please pull the following:
- Stefan removes the activity LED node from the CM3 DTS since there is
no driver for that LED yet and leds-gpio cannot drive it either
* tag 'arm-soc/for-5.4/devicetree-fixes-part2' of https://github.com/Broadcom/stblinux:
ARM: dts: bcm2837-rpi-cm3: Avoid leds-gpio probing issue
Link: https://lore.kernel.org/r/20191021194302.21024-1-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi index 7c3cb7ece6cb..925cb37c22f0 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi @@ -9,6 +9,14 @@ reg = <0 0x40000000>; }; + leds { + /* + * Since there is no upstream GPIO driver yet, + * remove the incomplete node. + */ + /delete-node/ act; + }; + reg_3v3: fixed-regulator { compatible = "regulator-fixed"; regulator-name = "3V3"; |