arm64: dts: vexpress: 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/refclk32khz
                          missing or empty reg/ranges property

Move the fixed clocks, the fixed regulator, the leds 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-5-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/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index 8010cdc..d4d88ce 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
@@ -19,6 +19,160 @@
  */
 
 / {
+       v2m_fixed_3v3: fixed-regulator-0 {
+               compatible = "regulator-fixed";
+               regulator-name = "3V3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+
+       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";
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               user1 {
+                       label = "v2m:green:user1";
+                       gpios = <&v2m_led_gpios 0 0>;
+                       linux,default-trigger = "heartbeat";
+               };
+
+               user2 {
+                       label = "v2m:green:user2";
+                       gpios = <&v2m_led_gpios 1 0>;
+                       linux,default-trigger = "disk-activity";
+               };
+
+               user3 {
+                       label = "v2m:green:user3";
+                       gpios = <&v2m_led_gpios 2 0>;
+                       linux,default-trigger = "cpu0";
+               };
+
+               user4 {
+                       label = "v2m:green:user4";
+                       gpios = <&v2m_led_gpios 3 0>;
+                       linux,default-trigger = "cpu1";
+               };
+
+               user5 {
+                       label = "v2m:green:user5";
+                       gpios = <&v2m_led_gpios 4 0>;
+                       linux,default-trigger = "cpu2";
+               };
+
+               user6 {
+                       label = "v2m:green:user6";
+                       gpios = <&v2m_led_gpios 5 0>;
+                       linux,default-trigger = "cpu3";
+               };
+
+               user7 {
+                       label = "v2m:green:user7";
+                       gpios = <&v2m_led_gpios 6 0>;
+                       linux,default-trigger = "cpu4";
+               };
+
+               user8 {
+                       label = "v2m:green:user8";
+                       gpios = <&v2m_led_gpios 7 0>;
+                       linux,default-trigger = "cpu5";
+               };
+       };
+
+       mcc {
+               compatible = "arm,vexpress,config-bus";
+               arm,vexpress,config-bridge = <&v2m_sysreg>;
+
+               oscclk0 {
+                       /* MCC static memory clock */
+                       compatible = "arm,vexpress-osc";
+                       arm,vexpress-sysreg,func = <1 0>;
+                       freq-range = <25000000 60000000>;
+                       #clock-cells = <0>;
+                       clock-output-names = "v2m:oscclk0";
+               };
+
+               v2m_oscclk1: oscclk1 {
+                       /* CLCD clock */
+                       compatible = "arm,vexpress-osc";
+                       arm,vexpress-sysreg,func = <1 1>;
+                       freq-range = <23750000 65000000>;
+                       #clock-cells = <0>;
+                       clock-output-names = "v2m:oscclk1";
+               };
+
+               v2m_oscclk2: oscclk2 {
+                       /* IO FPGA peripheral clock */
+                       compatible = "arm,vexpress-osc";
+                       arm,vexpress-sysreg,func = <1 2>;
+                       freq-range = <24000000 24000000>;
+                       #clock-cells = <0>;
+                       clock-output-names = "v2m:oscclk2";
+               };
+
+               volt-vio {
+                       /* Logic level voltage */
+                       compatible = "arm,vexpress-volt";
+                       arm,vexpress-sysreg,func = <2 0>;
+                       regulator-name = "VIO";
+                       regulator-always-on;
+                       label = "VIO";
+               };
+
+               temp-mcc {
+                       /* MCC internal operating temperature */
+                       compatible = "arm,vexpress-temp";
+                       arm,vexpress-sysreg,func = <4 0>;
+                       label = "MCC";
+               };
+
+               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 {
                        model = "V2M-P1";
@@ -282,160 +436,6 @@
                                        };
                                };
                        };
-
-                       v2m_fixed_3v3: fixed-regulator-0 {
-                               compatible = "regulator-fixed";
-                               regulator-name = "3V3";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-
-                       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";
-                       };
-
-                       leds {
-                               compatible = "gpio-leds";
-
-                               user1 {
-                                       label = "v2m:green:user1";
-                                       gpios = <&v2m_led_gpios 0 0>;
-                                       linux,default-trigger = "heartbeat";
-                               };
-
-                               user2 {
-                                       label = "v2m:green:user2";
-                                       gpios = <&v2m_led_gpios 1 0>;
-                                       linux,default-trigger = "mmc0";
-                               };
-
-                               user3 {
-                                       label = "v2m:green:user3";
-                                       gpios = <&v2m_led_gpios 2 0>;
-                                       linux,default-trigger = "cpu0";
-                               };
-
-                               user4 {
-                                       label = "v2m:green:user4";
-                                       gpios = <&v2m_led_gpios 3 0>;
-                                       linux,default-trigger = "cpu1";
-                               };
-
-                               user5 {
-                                       label = "v2m:green:user5";
-                                       gpios = <&v2m_led_gpios 4 0>;
-                                       linux,default-trigger = "cpu2";
-                               };
-
-                               user6 {
-                                       label = "v2m:green:user6";
-                                       gpios = <&v2m_led_gpios 5 0>;
-                                       linux,default-trigger = "cpu3";
-                               };
-
-                               user7 {
-                                       label = "v2m:green:user7";
-                                       gpios = <&v2m_led_gpios 6 0>;
-                                       linux,default-trigger = "cpu4";
-                               };
-
-                               user8 {
-                                       label = "v2m:green:user8";
-                                       gpios = <&v2m_led_gpios 7 0>;
-                                       linux,default-trigger = "cpu5";
-                               };
-                       };
-
-                       mcc {
-                               compatible = "arm,vexpress,config-bus";
-                               arm,vexpress,config-bridge = <&v2m_sysreg>;
-
-                               oscclk0 {
-                                       /* MCC static memory clock */
-                                       compatible = "arm,vexpress-osc";
-                                       arm,vexpress-sysreg,func = <1 0>;
-                                       freq-range = <25000000 60000000>;
-                                       #clock-cells = <0>;
-                                       clock-output-names = "v2m:oscclk0";
-                               };
-
-                               v2m_oscclk1: oscclk1 {
-                                       /* CLCD clock */
-                                       compatible = "arm,vexpress-osc";
-                                       arm,vexpress-sysreg,func = <1 1>;
-                                       freq-range = <23750000 65000000>;
-                                       #clock-cells = <0>;
-                                       clock-output-names = "v2m:oscclk1";
-                               };
-
-                               v2m_oscclk2: oscclk2 {
-                                       /* IO FPGA peripheral clock */
-                                       compatible = "arm,vexpress-osc";
-                                       arm,vexpress-sysreg,func = <1 2>;
-                                       freq-range = <24000000 24000000>;
-                                       #clock-cells = <0>;
-                                       clock-output-names = "v2m:oscclk2";
-                               };
-
-                               volt-vio {
-                                       /* Logic level voltage */
-                                       compatible = "arm,vexpress-volt";
-                                       arm,vexpress-sysreg,func = <2 0>;
-                                       regulator-name = "VIO";
-                                       regulator-always-on;
-                                       label = "VIO";
-                               };
-
-                               temp-mcc {
-                                       /* MCC internal operating temperature */
-                                       compatible = "arm,vexpress-temp";
-                                       arm,vexpress-sysreg,func = <4 0>;
-                                       label = "MCC";
-                               };
-
-                               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>;
-                               };
-                       };
                };
        };
 };