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

[Rob Herring (Arm)]

Commit b32673d226c9 ("arm64: dts: broadcom: bcm2712: 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: b32673d226c9 ("arm64: dts: broadcom: bcm2712: 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>
---
 .../dts/broadcom/bcm2712-rpi-5-b-base.dtsi    | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi
index 7d4742ebe247..d0b7137e07d2 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi
@@ -44,25 +44,27 @@ power_button: power-button {
 		};
 	};
 
-	firmware: firmware {
-		compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
-
-		mboxes = <&mailbox>;
-
-		firmware_clocks: clocks {
-			compatible = "raspberrypi,firmware-clocks";
-			#clock-cells = <1>;
-		};
-
-		reset: reset {
-			compatible = "raspberrypi,firmware-reset";
-			#reset-cells = <1>;
-		};
-
-		power: power {
-			compatible = "raspberrypi,bcm2835-power";
-			firmware = <&firmware>;
-			#power-domain-cells = <1>;
+	firmware {
+		firmware: rpi-firmware {
+			compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
+
+			mboxes = <&mailbox>;
+
+			firmware_clocks: clocks {
+				compatible = "raspberrypi,firmware-clocks";
+				#clock-cells = <1>;
+			};
+
+			reset: reset {
+				compatible = "raspberrypi,firmware-reset";
+				#reset-cells = <1>;
+			};
+
+			power: power {
+				compatible = "raspberrypi,bcm2835-power";
+				firmware = <&firmware>;
+				#power-domain-cells = <1>;
+			};
 		};
 	};
 
-- 
2.51.0