[PATCH 1/2] ARM: dts: broadcom: bcm2835-rpi: Move the firmware node down 1 level

[Rob Herring (Arm)]

Commit 32eea985999b ("ARM: dts: broadcom: bcm2835-rpi: Move non
simple-bus nodes to root level") moved the firmware nodes into the
standard /firmware. However, /firmware is intended to be just a
container for firmware nodes as it is possible to have multiple types of
firmware (e.g. SCMI, OP-TEE, etc.). Move the RPi firmware down a level.

Fixes: 32eea985999b ("ARM: dts: broadcom: bcm2835-rpi: Move non simple-bus nodes to root level")
Reported-by: Marek Szyprowski <m.szyprowski at samsung.com>
Signed-off-by: Rob Herring (Arm) <robh at kernel.org>
---
This is only half the fix. Unfortunately, a kernel change[1] is also 
needed to make this all work. I do plan for that to go to stable. I'll 
leave it up to the Broadcom maintainers whether it's preferred to revert 
the fixed patches or apply these fixes. A 3rd option is revert for now 
and apply these DT changes some time later to give some time for stable 
updates.

Rob

[1] https://lore.kernel.org/all/20260114015158.692170-2-robh@kernel.org/

 arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi | 24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
index 9ab70b519a63..46c91468f4c5 100644
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
@@ -1,19 +1,21 @@
 #include <dt-bindings/power/raspberrypi-power.h>
 
 / {
-	firmware: firmware {
-		compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
-		mboxes = <&mailbox>;
+	firmware {
+		firmware: rpi-firmware {
+			compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
+			mboxes = <&mailbox>;
 
-		firmware_clocks: clocks {
-			compatible = "raspberrypi,firmware-clocks";
-			#clock-cells = <1>;
-		};
+			firmware_clocks: clocks {
+				compatible = "raspberrypi,firmware-clocks";
+				#clock-cells = <1>;
+			};
 
-		power: power {
-			compatible = "raspberrypi,bcm2835-power";
-			firmware = <&firmware>;
-			#power-domain-cells = <1>;
+			power: power {
+				compatible = "raspberrypi,bcm2835-power";
+				firmware = <&firmware>;
+				#power-domain-cells = <1>;
+			};
 		};
 	};
 
-- 
2.51.0