Skip to content

Commit

Permalink
Merge tag 'arm-soc/for-5.4/devicetree-fixes-part2' of https://github.…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
olofj committed Oct 21, 2019
2 parents 6813a9c + 626c45d commit cc3fafd
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit cc3fafd

Please sign in to comment.