arm64: dts: juno/vexpress: fix node name unit-address presence warnings

Commit fa38a82096a1 ("scripts/dtc: Update to upstream version
53bf130b1cdd") added warnings on node name unit-address presence/absence
mismatch in device trees.

This patch fixes those warning on all the juno/vexpress platforms where
unit-address is present in node name while the reg/ranges property is
not present. It also adds unit-address to all smb bus node.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
index 5fbdfcb..65f716e 100644 (file)
--- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi
+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -97,7 +97,7 @@
                timeout-sec = <30>;
        };
 
-       smb {
+       smb@08000000 {
                compatible = "arm,vexpress,v2m-p1", "simple-bus";
                arm,v2m-memory-map = "rs1";
                #address-cells = <2>; /* SMB chipselect number and offset */

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 31d5d44..9a96bc0 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -105,13 +105,13 @@
                clocks {
                        compatible = "arm,scpi-clocks";
 
-                       scpi_dvfs: scpi_clocks@0 {
+                       scpi_dvfs: scpi-dvfs {
                                compatible = "arm,scpi-dvfs-clocks";
                                #clock-cells = <1>;
                                clock-indices = <0>, <1>, <2>;
                                clock-output-names = "atlclk", "aplclk","gpuclk";
                        };
-                       scpi_clk: scpi_clocks@3 {
+                       scpi_clk: scpi-clk {
                                compatible = "arm,scpi-variable-clocks";
                                #clock-cells = <1>;
                                clock-indices = <3>;
@@ -153,7 +153,7 @@
                clock-names = "pxlclk";
 
                port {
-                       hdlcd1_output: endpoint@0 {
+                       hdlcd1_output: hdlcd1-endpoint {
                                remote-endpoint = <&tda998x_1_input>;
                        };
                };
@@ -167,7 +167,7 @@
                clock-names = "pxlclk";
 
                port {
-                       hdlcd0_output: endpoint@0 {
+                       hdlcd0_output: hdlcd0-endpoint {
                                remote-endpoint = <&tda998x_0_input>;
                        };
                };
@@ -195,7 +195,7 @@
                        compatible = "nxp,tda998x";
                        reg = <0x70>;
                        port {
-                               tda998x_0_input: endpoint@0 {
+                               tda998x_0_input: tda998x-0-endpoint {
                                        remote-endpoint = <&hdlcd0_output>;
                                };
                        };
@@ -205,7 +205,7 @@
                        compatible = "nxp,tda998x";
                        reg = <0x71>;
                        port {
-                               tda998x_1_input: endpoint@0 {
+                               tda998x_1_input: tda998x-1-endpoint {
                                        remote-endpoint = <&hdlcd1_output>;
                                };
                        };
@@ -242,7 +242,7 @@
                      <0x00000008 0x80000000 0x1 0x80000000>;
        };
 
-       smb {
+       smb@08000000 {
                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 413f1b9..5aa8bf4 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -46,7 +46,7 @@
                        arm,vexpress,site = <0>;
                        arm,v2m-memory-map = "rs1";
 
-                       mb_fixed_3v3: fixedregulator@0 {
+                       mb_fixed_3v3: mcc-sb-3v3 {
                                compatible = "regulator-fixed";
                                regulator-name = "MCC_SB_3V3";
                                regulator-min-microvolt = <3300000>;
@@ -59,42 +59,42 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
 
-                               button@1 {
+                               power-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <116>;
                                        label = "POWER";
                                        gpios = <&iofpga_gpio0 0 0x4>;
                                };
-                               button@2 {
+                               home-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <102>;
                                        label = "HOME";
                                        gpios = <&iofpga_gpio0 1 0x4>;
                                };
-                               button@3 {
+                               rlock-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <152>;
                                        label = "RLOCK";
                                        gpios = <&iofpga_gpio0 2 0x4>;
                                };
-                               button@4 {
+                               vol-up-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <115>;
                                        label = "VOL+";
                                        gpios = <&iofpga_gpio0 3 0x4>;
                                };
-                               button@5 {
+                               vol-down-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <114>;
                                        label = "VOL-";
                                        gpios = <&iofpga_gpio0 4 0x4>;
                                };
-                               button@6 {
+                               nmi-button {
                                        debounce_interval = <50>;
                                        wakeup-source;
                                        linux,code = <99>;
@@ -159,7 +159,7 @@
                                        compatible = "syscon", "simple-mfd";
                                        reg = <0x010000 0x1000>;
 
-                                       led@08.0 {
+                                       led0 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x01>;
@@ -167,7 +167,7 @@
                                                linux,default-trigger = "heartbeat";
                                                default-state = "on";
                                        };
-                                       led@08.1 {
+                                       led1 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x02>;
@@ -175,7 +175,7 @@
                                                linux,default-trigger = "mmc0";
                                                default-state = "off";
                                        };
-                                       led@08.2 {
+                                       led2 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x04>;
@@ -183,7 +183,7 @@
                                                linux,default-trigger = "cpu0";
                                                default-state = "off";
                                        };
-                                       led@08.3 {
+                                       led3 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x08>;
@@ -191,7 +191,7 @@
                                                linux,default-trigger = "cpu1";
                                                default-state = "off";
                                        };
-                                       led@08.4 {
+                                       led4 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x10>;
@@ -199,7 +199,7 @@
                                                linux,default-trigger = "cpu2";
                                                default-state = "off";
                                        };
-                                       led@08.5 {
+                                       led5 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x20>;
@@ -207,14 +207,14 @@
                                                linux,default-trigger = "cpu3";
                                                default-state = "off";
                                        };
-                                       led@08.6 {
+                                       led6 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x40>;
                                                label = "vexpress:6";
                                                default-state = "off";
                                        };
-                                       led@08.7 {
+                                       led7 {
                                                compatible = "register-bit-led";
                                                offset = <0x08>;
                                                mask = <0x80>;

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
index 20addab..a852e28 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -104,7 +104,7 @@
                             <0 63 4>;
        };
 
-       smb {
+       smb@08000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index 88a7583..321b43b 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -226,7 +226,7 @@
                        };
                };
 
-               v2m_fixed_3v3: fixedregulator@0 {
+               v2m_fixed_3v3: v2m-3v3 {
                        compatible = "regulator-fixed";
                        regulator-name = "3V3";
                        regulator-min-microvolt = <3300000>;
@@ -238,7 +238,7 @@
                        compatible = "arm,vexpress,config-bus";
                        arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-                       v2m_oscclk1: osc@1 {
+                       v2m_oscclk1: oscclk1 {
                                /* CLCD clock */
                                compatible = "arm,vexpress-osc";
                                arm,vexpress-sysreg,func = <1 1>;
@@ -247,27 +247,27 @@
                                clock-output-names = "v2m:oscclk1";
                        };
 
-                       reset@0 {
+                       reset {
                                compatible = "arm,vexpress-reset";
                                arm,vexpress-sysreg,func = <5 0>;
                        };
 
-                       muxfpga@0 {
+                       muxfpga {
                                compatible = "arm,vexpress-muxfpga";
                                arm,vexpress-sysreg,func = <7 0>;
                        };
 
-                       shutdown@0 {
+                       shutdown {
                                compatible = "arm,vexpress-shutdown";
                                arm,vexpress-sysreg,func = <8 0>;
                        };
 
-                       reboot@0 {
+                       reboot {
                                compatible = "arm,vexpress-reboot";
                                arm,vexpress-sysreg,func = <9 0>;
                        };
 
-                       dvimode@0 {
+                       dvimode {
                                compatible = "arm,vexpress-dvimode";
                                arm,vexpress-sysreg,func = <11 0>;
                        };

diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
index bb3c26d..e3a1711 100644 (file)
--- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
+++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
@@ -93,7 +93,7 @@
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-               smbclk: osc@4 {
+               smbclk: smclk {
                        /* SMC clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 4>;
@@ -102,7 +102,7 @@
                        clock-output-names = "smclk";
                };
 
-               volt@0 {
+               volt-vio {
                        /* VIO to expansion board above */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 0>;
@@ -112,7 +112,7 @@
                        regulator-always-on;
                };
 
-               volt@1 {
+               volt-12v {
                        /* 12V from power connector J6 */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 1>;
@@ -120,7 +120,7 @@
                        regulator-always-on;
                };
 
-               temp@0 {
+               temp-fpga {
                        /* FPGA temperature */
                        compatible = "arm,vexpress-temp";
                        arm,vexpress-sysreg,func = <4 0>;
@@ -128,7 +128,7 @@
                };
        };
 
-       smb {
+       smb@08000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;