diff mbox series

[V2,2/2] ARM: dts: bcm2711-rpi-400: Fix delete-node of led_act

Message ID 20231118124252.14838-3-wahrenst@gmx.net
State New
Headers show
Series ARM: dts: bcm2711-rpi-400: Fix delete-node of led_act | expand

Commit Message

Stefan Wahren Nov. 18, 2023, 12:42 p.m. UTC 
The LED ACT which is included from bcm2711-rpi-4-b doesn't exists
on the Raspberry Pi 400. So the bcm2711-rpi-400.dts tries to
use the delete-node directive in order to remove the complete
node. Unfortunately the usage get broken in commit 1156e3a78bcc
("ARM: dts: bcm283x: Move ACT LED into separate dtsi")
and now ACT and PWR LED using the same GPIO and this prevent
probing of led-gpios on Raspberry Pi 400:

    leds-gpio: probe of leds failed with error -16

So fix the delete-node directive.

Fixes: 1156e3a78bcc ("ARM: dts: bcm283x: Move ACT LED into separate dtsi")
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--
2.34.1

Comments

Florian Fainelli Nov. 29, 2023, 12:26 a.m. UTC | #1 
From: Florian Fainelli <f.fainelli@gmail.com>

On Sat, 18 Nov 2023 13:42:52 +0100, Stefan Wahren <wahrenst@gmx.net> wrote:
> The LED ACT which is included from bcm2711-rpi-4-b doesn't exists
> on the Raspberry Pi 400. So the bcm2711-rpi-400.dts tries to
> use the delete-node directive in order to remove the complete
> node. Unfortunately the usage get broken in commit 1156e3a78bcc
> ("ARM: dts: bcm283x: Move ACT LED into separate dtsi")
> and now ACT and PWR LED using the same GPIO and this prevent
> probing of led-gpios on Raspberry Pi 400:
> 
>     leds-gpio: probe of leds failed with error -16
> 
> So fix the delete-node directive.
> 
> Fixes: 1156e3a78bcc ("ARM: dts: bcm283x: Move ACT LED into separate dtsi")
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/fixes, thanks!
--
Florian
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts b/arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts
index 1ab8184302db..5a2869a18bd5 100644
--- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts
@@ -36,9 +36,7 @@  &led_pwr {
 	gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 };

-&leds {
-	/delete-node/ led_act;
-};
+/delete-node/ &led_act;

 &pm {
 	/delete-property/ system-power-controller;