ARM: dts: vexpress: fix node name unit-address presence warnings

[mirror_ubuntu-zesty-kernel.git] / arch / arm / boot / dts / vexpress-v2p-ca15-tc1.dts

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
index 9420053acc14639ffa24e992dfb3bd3eaf5d9071..50af17728491708fa7cf72837e20f1477413aec5 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
@@ -55,14 +55,14 @@
                compatible = "arm,hdlcd";
                reg = <0 0x2b000000 0 0x1000>;
                interrupts = <0 85 4>;
-               clocks = <&oscclk5>;
+               clocks = <&hdlcd_clk>;
                clock-names = "pxlclk";
        };
 
        memory-controller@2b0a0000 {
                compatible = "arm,pl341", "arm,primecell";
                reg = <0 0x2b0a0000 0 0x1000>;
-               clocks = <&oscclk7>;
+               clocks = <&sys_pll>;
                clock-names = "apb_pclk";
        };
 
@@ -71,7 +71,7 @@
                status = "disabled";
                reg = <0 0x2b060000 0 0x1000>;
                interrupts = <0 98 4>;
-               clocks = <&oscclk7>;
+               clocks = <&sys_pll>;
                clock-names = "apb_pclk";
        };
 
@@ -92,7 +92,7 @@
                reg = <0 0x7ffd0000 0 0x1000>;
                interrupts = <0 86 4>,
                             <0 87 4>;
-               clocks = <&oscclk7>;
+               clocks = <&sys_pll>;
                clock-names = "apb_pclk";
        };
 
@@ -104,7 +104,7 @@
                             <0 89 4>,
                             <0 90 4>,
                             <0 91 4>;
-               clocks = <&oscclk7>;
+               clocks = <&sys_pll>;
                clock-names = "apb_pclk";
        };
 
@@ -126,7 +126,7 @@
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-               osc@0 {
+               oscclk0 {
                        /* CPU PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 0>;
@@ -135,7 +135,7 @@
                        clock-output-names = "oscclk0";
                };
 
-               osc@4 {
+               oscclk4 {
                        /* Multiplexed AXI master clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 4>;
@@ -144,7 +144,7 @@
                        clock-output-names = "oscclk4";
                };
 
-               oscclk5: osc@5 {
+               hdlcd_clk: oscclk5 {
                        /* HDLCD PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 5>;
@@ -153,7 +153,7 @@
                        clock-output-names = "oscclk5";
                };
 
-               smbclk: osc@6 {
+               smbclk: oscclk6 {
                        /* SMB clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 6>;
@@ -162,7 +162,7 @@
                        clock-output-names = "oscclk6";
                };
 
-               oscclk7: osc@7 {
+               sys_pll: oscclk7 {
                        /* SYS PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 7>;
@@ -171,7 +171,7 @@
                        clock-output-names = "oscclk7";
                };
 
-               osc@8 {
+               oscclk8 {
                        /* DDR2 PLL reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 8>;
@@ -180,7 +180,7 @@
                        clock-output-names = "oscclk8";
                };
 
-               volt@0 {
+               volt-cores {
                        /* CPU core voltage */
                        compatible = "arm,vexpress-volt";
                        arm,vexpress-sysreg,func = <2 0>;
@@ -191,28 +191,28 @@
                        label = "Cores";
                };
 
-               amp@0 {
+               amp-cores {
                        /* Total current for the two cores */
                        compatible = "arm,vexpress-amp";
                        arm,vexpress-sysreg,func = <3 0>;
                        label = "Cores";
                };
 
-               temp@0 {
+               temp-dcc {
                        /* DCC internal temperature */
                        compatible = "arm,vexpress-temp";
                        arm,vexpress-sysreg,func = <4 0>;
                        label = "DCC";
                };
 
-               power@0 {
+               power-cores {
                        /* Total power */
                        compatible = "arm,vexpress-power";
                        arm,vexpress-sysreg,func = <12 0>;
                        label = "Cores";
                };
 
-               energy@0 {
+               energy {
                        /* Total energy */
                        compatible = "arm,vexpress-energy";
                        arm,vexpress-sysreg,func = <13 0>;
@@ -220,7 +220,7 @@
                };
        };
 
-       smb {
+       smb@08000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;