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

Move the fixed clocks, the fixed regulator, and the gpio keys to the
root node, since they do not depend on any busses.

Link: https://lore.kernel.org/r/20200513103016.130417-7-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/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index d5cefddde08c283a7fe011c014eaa459d35a792b..f3279327a66542785b7ca2b0a5f14e25b55b2380 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -8,35 +8,90 @@
  */
 
 / {
-       bus@8000000 {
-               mb_clk24mhz: clk24mhz {
-                       compatible = "fixed-clock";
-                       #clock-cells = <0>;
-                       clock-frequency = <24000000>;
-                       clock-output-names = "juno_mb:clk24mhz";
-               };
+       mb_clk24mhz: clk24mhz {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <24000000>;
+               clock-output-names = "juno_mb:clk24mhz";
+       };
 
-               mb_clk25mhz: clk25mhz {
-                       compatible = "fixed-clock";
-                       #clock-cells = <0>;
-                       clock-frequency = <25000000>;
-                       clock-output-names = "juno_mb:clk25mhz";
-               };
+       mb_clk25mhz: clk25mhz {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <25000000>;
+               clock-output-names = "juno_mb:clk25mhz";
+       };
 
-               v2m_refclk1mhz: refclk1mhz {
-                       compatible = "fixed-clock";
-                       #clock-cells = <0>;
-                       clock-frequency = <1000000>;
-                       clock-output-names = "juno_mb:refclk1mhz";
-               };
+       v2m_refclk1mhz: refclk1mhz {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <1000000>;
+               clock-output-names = "juno_mb:refclk1mhz";
+       };
 
-               v2m_refclk32khz: refclk32khz {
-                       compatible = "fixed-clock";
-                       #clock-cells = <0>;
-                       clock-frequency = <32768>;
-                       clock-output-names = "juno_mb:refclk32khz";
+       v2m_refclk32khz: refclk32khz {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <32768>;
+               clock-output-names = "juno_mb:refclk32khz";
+       };
+
+       mb_fixed_3v3: mcc-sb-3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "MCC_SB_3V3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+
+               power-button {
+                       debounce-interval = <50>;
+                       wakeup-source;
+                       linux,code = <116>;
+                       label = "POWER";
+                       gpios = <&iofpga_gpio0 0 0x4>;
+               };
+               home-button {
+                       debounce-interval = <50>;
+                       wakeup-source;
+                       linux,code = <102>;
+                       label = "HOME";
+                       gpios = <&iofpga_gpio0 1 0x4>;
+               };
+               rlock-button {
+                       debounce-interval = <50>;
+                       wakeup-source;
+                       linux,code = <152>;
+                       label = "RLOCK";
+                       gpios = <&iofpga_gpio0 2 0x4>;
+               };
+               vol-up-button {
+                       debounce-interval = <50>;
+                       wakeup-source;
+                       linux,code = <115>;
+                       label = "VOL+";
+                       gpios = <&iofpga_gpio0 3 0x4>;
                };
+               vol-down-button {
+                       debounce-interval = <50>;
+                       wakeup-source;
+                       linux,code = <114>;
+                       label = "VOL-";
+                       gpios = <&iofpga_gpio0 4 0x4>;
+               };
+               nmi-button {
+                       debounce-interval = <50>;
+                       wakeup-source;
+                       linux,code = <99>;
+                       label = "NMI";
+                       gpios = <&iofpga_gpio0 5 0x4>;
+               };
+       };
 
+       bus@8000000 {
                motherboard {
                        compatible = "arm,vexpress,v2p-p1", "simple-bus";
                        #address-cells = <2>;  /* SMB chipselect number and offset */
@@ -48,61 +103,6 @@
                        arm,vexpress,site = <0>;
                        arm,v2m-memory-map = "rs1";
 
-                       mb_fixed_3v3: mcc-sb-3v3 {
-                               compatible = "regulator-fixed";
-                               regulator-name = "MCC_SB_3V3";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-
-                       gpio-keys {
-                               compatible = "gpio-keys";
-
-                               power-button {
-                                       debounce-interval = <50>;
-                                       wakeup-source;
-                                       linux,code = <116>;
-                                       label = "POWER";
-                                       gpios = <&iofpga_gpio0 0 0x4>;
-                               };
-                               home-button {
-                                       debounce-interval = <50>;
-                                       wakeup-source;
-                                       linux,code = <102>;
-                                       label = "HOME";
-                                       gpios = <&iofpga_gpio0 1 0x4>;
-                               };
-                               rlock-button {
-                                       debounce-interval = <50>;
-                                       wakeup-source;
-                                       linux,code = <152>;
-                                       label = "RLOCK";
-                                       gpios = <&iofpga_gpio0 2 0x4>;
-                               };
-                               vol-up-button {
-                                       debounce-interval = <50>;
-                                       wakeup-source;
-                                       linux,code = <115>;
-                                       label = "VOL+";
-                                       gpios = <&iofpga_gpio0 3 0x4>;
-                               };
-                               vol-down-button {
-                                       debounce-interval = <50>;
-                                       wakeup-source;
-                                       linux,code = <114>;
-                                       label = "VOL-";
-                                       gpios = <&iofpga_gpio0 4 0x4>;
-                               };
-                               nmi-button {
-                                       debounce-interval = <50>;
-                                       wakeup-source;
-                                       linux,code = <99>;
-                                       label = "NMI";
-                                       gpios = <&iofpga_gpio0 5 0x4>;
-                               };
-                       };
-
                        flash@0 {
                                /* 2 * 32MiB NOR Flash memory mounted on CS0 */
                                compatible = "arm,vexpress-flash", "cfi-flash";