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

[deliverable/linux.git] / arch / arm / boot / dts / vexpress-v2p-ca5s.dts

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
index d2709b73316b20cb6a379be4cf9ac1aea136a039..7c7a1b465316162670c04580b27387c4858901c6 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
@@ -57,14 +57,14 @@
                compatible = "arm,hdlcd";
                reg = <0x2a110000 0x1000>;
                interrupts = <0 85 4>;
-               clocks = <&oscclk3>;
+               clocks = <&hdlcd_clk>;
                clock-names = "pxlclk";
        };
 
        memory-controller@2a150000 {
                compatible = "arm,pl341", "arm,primecell";
                reg = <0x2a150000 0x1000>;
-               clocks = <&oscclk1>;
+               clocks = <&axi_clk>;
                clock-names = "apb_pclk";
        };
 
@@ -73,7 +73,7 @@
                reg = <0x2a190000 0x1000>;
                interrupts = <0 86 4>,
                             <0 87 4>;
-               clocks = <&oscclk1>;
+               clocks = <&axi_clk>;
                clock-names = "apb_pclk";
        };
 
@@ -93,7 +93,7 @@
                             "arm,cortex-a9-global-timer";
                reg = <0x2c000200 0x20>;
                interrupts = <1 11 0x304>;
-               clocks = <&oscclk0>;
+               clocks = <&cpu_clk>;
        };
 
        watchdog@2c000620 {
@@ -128,7 +128,7 @@
                compatible = "arm,vexpress,config-bus";
                arm,vexpress,config-bridge = <&v2m_sysreg>;
 
-               oscclk0: osc@0 {
+               cpu_clk: oscclk0 {
                        /* CPU and internal AXI reference clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 0>;
@@ -137,7 +137,7 @@
                        clock-output-names = "oscclk0";
                };
 
-               oscclk1: osc@1 {
+               axi_clk: oscclk1 {
                        /* Multiplexed AXI master clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 1>;
@@ -146,7 +146,7 @@
                        clock-output-names = "oscclk1";
                };
 
-               osc@2 {
+               oscclk2 {
                        /* DDR2 */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 2>;
@@ -155,7 +155,7 @@
                        clock-output-names = "oscclk2";
                };
 
-               oscclk3: osc@3 {
+               hdlcd_clk: oscclk3 {
                        /* HDLCD */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 3>;
@@ -164,7 +164,7 @@
                        clock-output-names = "oscclk3";
                };
 
-               osc@4 {
+               oscclk4 {
                        /* Test chip gate configuration */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 4>;
@@ -173,7 +173,7 @@
                        clock-output-names = "oscclk4";
                };
 
-               smbclk: osc@5 {
+               smbclk: oscclk5 {
                        /* SMB clock */
                        compatible = "arm,vexpress-osc";
                        arm,vexpress-sysreg,func = <1 5>;
@@ -182,7 +182,7 @@
                        clock-output-names = "oscclk5";
                };
 
-               temp@0 {
+               temp-dcc {
                        /* DCC internal operating temperature */
                        compatible = "arm,vexpress-temp";
                        arm,vexpress-sysreg,func = <4 0>;
@@ -190,7 +190,7 @@
                };
        };
 
-       smb {
+       smb@08000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;