diff options
author | Stefan Wahren <stefan.wahren@i2se.com> | 2022-11-10 18:31:05 +0100 |
---|---|---|
committer | Florian Fainelli <f.fainelli@gmail.com> | 2022-11-10 20:41:58 +0100 |
commit | 1156e3a78bcc1e4673b3e32e98e3fd09cbc7067b (patch) | |
tree | 44c5f62028ced1ef62e4e370b1ead65d8b84ff39 /arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | |
parent | ARM: dts: bcm283x: Fix underscores in node names (diff) | |
download | linux-1156e3a78bcc1e4673b3e32e98e3fd09cbc7067b.tar.xz linux-1156e3a78bcc1e4673b3e32e98e3fd09cbc7067b.zip |
ARM: dts: bcm283x: Move ACT LED into separate dtsi
The usage of the label property for gpio-leds has been deprecated
a long time ago. In bcm2835-rpi.dtsi the ACT LED uses such a label
and derive it to almost every Raspberry Pi board. Since we cannot break
userspace interface this property must be kept. But we can move the
ACT LED into a separate dtsi and include them from the board files.
This change have two benefits:
- with both new refs it's now clear the LED part is included from a dtsi
- new boards do not include the deprecated stuff automatically
Reported-by: Alexander Dahl <ada@thorsis.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/20221110173105.6633-3-stefan.wahren@i2se.com
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm/boot/dts/bcm2835-rpi-zero-w.dts')
-rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts index 9b3a2070a629..dbf825985ec0 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -7,6 +7,7 @@ #include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" #include "bcm2835-rpi-common.dtsi" +#include "bcm283x-rpi-led-deprecated.dtsi" #include "bcm283x-rpi-usb-otg.dtsi" #include "bcm283x-rpi-wifi-bt.dtsi" @@ -23,12 +24,6 @@ /* 8250 auxiliary UART instead of pl011 */ stdout-path = "serial1:115200n8"; }; - - leds { - led-act { - gpios = <&gpio 47 GPIO_ACTIVE_LOW>; - }; - }; }; &bt { @@ -111,6 +106,10 @@ status = "okay"; }; +&led_act { + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; +}; + &sdhci { pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>; }; |