arm64: dts: fvp: Move fixed devices out of bus node

The devicetree compiler complains when DT nodes without a reg property
live inside a (simple) bus node:
Warning (simple_bus_reg): Node /bus@8000000/motherboard-bus/v2m_refclk32khz
                          missing or empty reg/ranges property

Move the fixed clocks, the fixed regulator, and the config bus subtree
to the root node, since they do not depend on any busses.

Link: https://lore.kernel.org/r/20200513103016.130417-4-andre.przywara@arm.com
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index d1bfa62ca073e89096f2498d35e415eebca44be8..f61e313ab1a4c31f0c7ab44771720b6448e65b9e 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -8,6 +8,74 @@
  * VEMotherBoard.lisa
  */
 / {
+       v2m_clk24mhz: clk24mhz {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <24000000>;
+               clock-output-names = "v2m:clk24mhz";
+       };
+
+       v2m_refclk1mhz: refclk1mhz {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <1000000>;
+               clock-output-names = "v2m:refclk1mhz";
+       };
+
+       v2m_refclk32khz: refclk32khz {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <32768>;
+               clock-output-names = "v2m:refclk32khz";
+       };
+
+       v2m_fixed_3v3: v2m-3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "3V3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+
+       mcc {
+               compatible = "arm,vexpress,config-bus";
+               arm,vexpress,config-bridge = <&v2m_sysreg>;
+
+               v2m_oscclk1: oscclk1 {
+                       /* CLCD clock */
+                       compatible = "arm,vexpress-osc";
+                       arm,vexpress-sysreg,func = <1 1>;
+                       freq-range = <23750000 63500000>;
+                       #clock-cells = <0>;
+                       clock-output-names = "v2m:oscclk1";
+               };
+
+               reset {
+                       compatible = "arm,vexpress-reset";
+                       arm,vexpress-sysreg,func = <5 0>;
+               };
+
+               muxfpga {
+                       compatible = "arm,vexpress-muxfpga";
+                       arm,vexpress-sysreg,func = <7 0>;
+               };
+
+               shutdown {
+                       compatible = "arm,vexpress-shutdown";
+                       arm,vexpress-sysreg,func = <8 0>;
+               };
+
+               reboot {
+                       compatible = "arm,vexpress-reboot";
+                       arm,vexpress-sysreg,func = <9 0>;
+               };
+
+               dvimode {
+                       compatible = "arm,vexpress-dvimode";
+                       arm,vexpress-sysreg,func = <11 0>;
+               };
+       };
+
        bus@8000000 {
                motherboard {
                        arm,v2m-memory-map = "rs1";
@@ -30,27 +98,6 @@
                                interrupts = <15>;
                        };
 
-                       v2m_clk24mhz: clk24mhz {
-                               compatible = "fixed-clock";
-                               #clock-cells = <0>;
-                               clock-frequency = <24000000>;
-                               clock-output-names = "v2m:clk24mhz";
-                       };
-
-                       v2m_refclk1mhz: refclk1mhz {
-                               compatible = "fixed-clock";
-                               #clock-cells = <0>;
-                               clock-frequency = <1000000>;
-                               clock-output-names = "v2m:refclk1mhz";
-                       };
-
-                       v2m_refclk32khz: refclk32khz {
-                               compatible = "fixed-clock";
-                               #clock-cells = <0>;
-                               clock-frequency = <32768>;
-                               clock-output-names = "v2m:refclk32khz";
-                       };
-
                        iofpga@300000000 {
                                compatible = "simple-bus";
                                #address-cells = <1>;
@@ -198,53 +245,6 @@
                                        };
                                };
                        };
-
-                       v2m_fixed_3v3: v2m-3v3 {
-                               compatible = "regulator-fixed";
-                               regulator-name = "3V3";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-
-                       mcc {
-                               compatible = "arm,vexpress,config-bus";
-                               arm,vexpress,config-bridge = <&v2m_sysreg>;
-
-                               v2m_oscclk1: oscclk1 {
-                                       /* CLCD clock */
-                                       compatible = "arm,vexpress-osc";
-                                       arm,vexpress-sysreg,func = <1 1>;
-                                       freq-range = <23750000 63500000>;
-                                       #clock-cells = <0>;
-                                       clock-output-names = "v2m:oscclk1";
-                               };
-
-                               reset {
-                                       compatible = "arm,vexpress-reset";
-                                       arm,vexpress-sysreg,func = <5 0>;
-                               };
-
-                               muxfpga {
-                                       compatible = "arm,vexpress-muxfpga";
-                                       arm,vexpress-sysreg,func = <7 0>;
-                               };
-
-                               shutdown {
-                                       compatible = "arm,vexpress-shutdown";
-                                       arm,vexpress-sysreg,func = <8 0>;
-                               };
-
-                               reboot {
-                                       compatible = "arm,vexpress-reboot";
-                                       arm,vexpress-sysreg,func = <9 0>;
-                               };
-
-                               dvimode {
-                                       compatible = "arm,vexpress-dvimode";
-                                       arm,vexpress-sysreg,func = <11 0>;
-                               };
-                       };
                };
        };
 };