From ac2bc6bd7935e5835cb5925857b4b87a90163de1 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 10 Mar 2023 11:22:24 +0000 Subject: [PATCH 614/726] ARM: dts: bcm2711-rpi-400: Restore the ACT LED Pi 400 doesn't have an ACT LED, only a green PWR LED, but a user may wish to remap the ACT functionality to a GPIO on the 40-pin header. Restore the ACT LED declaration, but leave it disabled in order to prevent a GPIO being claimed until either the act_led_gpio dtparam or the act-led overlay is used. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm2711-rpi-400.dts | 12 ++++++++---- arch/arm/boot/dts/overlays/act-led-overlay.dts | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts index c54fb00b2920..cfb335180ce7 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts @@ -512,16 +512,19 @@ audio_pins: audio_pins { }; &leds { + // Declare the LED but leave it disabled, in case a user wants to map it + // to a GPIO on the header act_led: led-act { default-state = "off"; - linux,default-trigger = "default-on"; - gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "mmc0"; + gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; + status = "disabled"; }; pwr_led: led-pwr { default-state = "off"; linux,default-trigger = "default-on"; - gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; }; }; @@ -542,7 +545,8 @@ / { __overrides__ { audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}"; - act_led_gpio = <&act_led>,"gpios:4"; + act_led_gpio = <&act_led>,"gpios:4", + <&act_led>,"status=okay"; act_led_activelow = <&act_led>,"gpios:8"; act_led_trigger = <&act_led>,"linux,default-trigger"; diff --git a/arch/arm/boot/dts/overlays/act-led-overlay.dts b/arch/arm/boot/dts/overlays/act-led-overlay.dts index 2f4bbb407f89..fa10d60fd354 100644 --- a/arch/arm/boot/dts/overlays/act-led-overlay.dts +++ b/arch/arm/boot/dts/overlays/act-led-overlay.dts @@ -21,7 +21,8 @@ frag0: __overlay__ { }; __overrides__ { - gpio = <&frag0>,"gpios:4"; + gpio = <&frag0>,"gpios:4", + <&frag0>,"status=okay"; activelow = <&frag0>,"gpios:8"; }; }; -- 2.33.1