ARM: dts: bcm2711-rpi-400: Fix delete-node of led_act
authorStefan Wahren <wahrenst@gmx.net>
Sat, 18 Nov 2023 12:42:52 +0000 (13:42 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Dec 2023 17:45:14 +0000 (18:45 +0100)
[ Upstream commit dc761f11af2e39119d3a7942e3d10615f3d900e7 ]

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>
Link: https://lore.kernel.org/r/20231118124252.14838-3-wahrenst@gmx.net
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts

index 1ab8184..5a2869a 100644 (file)
@@ -36,9 +36,7 @@
        gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 };
 
-&leds {
-       /delete-node/ led_act;
-};
+/delete-node/ &led_act;
 
 &pm {
        /delete-property/ system-power-controller;