ARM: dts: broadcom: bcm2835-rpi: Move non simple-bus nodes to root level

The 'gpu' and 'firmware' nodes are not MMIO devices, so they should not be
under a 'simple-bus'. Additionally, the "raspberrypi,bcm2835-power" node
is part of the firmware, so move it under the 'rpi-firmware' node.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Link: https://lore.kernel.org/r/20260320154809.1246064-1-robh@kernel.org
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi b/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi
index 9261b67dbee1d45a1efe8ff1d002f7b29a56d272..1e76b290510d3ea8eea89308ac78a962c250a208 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi
@@ -141,9 +141,10 @@
                        interrupts = <1 10>;
                };
 
-               vc4: gpu {
-                       compatible = "brcm,bcm2835-vc4";
-               };
+       };
+
+       vc4: gpu {
+               compatible = "brcm,bcm2835-vc4";
        };
 };
 

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
index e9bf41b9f5c1814ae79f7b2308db885bf20d50ca..46c91468f4c54621a1f23482e761b8df92a6a63f 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
@@ -1,8 +1,8 @@
 #include <dt-bindings/power/raspberrypi-power.h>
 
 / {
-       soc {
-               firmware: firmware {
+       firmware {
+               firmware: rpi-firmware {
                        compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
                        mboxes = <&mailbox>;
 
@@ -10,14 +10,16 @@
                                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>;
+                       };
                };
+       };
 
+       soc {
                vchiq: mailbox@7e00b840 {
                        compatible = "brcm,bcm2835-vchiq";
                        reg = <0x7e00b840 0x3c>;