ARM: dts: keystone*: Use a single soc0 instance

Provide a soc0 node and reference the same to simplify dts. This also
resolves the following warnings when built with W=1:
arch/arm/boot/dts/keystone-k2hk-evm.dtb: Warning (unit_address_vs_reg): Node /soc has a reg or ranges property, but no unit name
arch/arm/boot/dts/keystone-k2l-evm.dtb: Warning (unit_address_vs_reg): Node /soc has a reg or ranges property, but no unit name
arch/arm/boot/dts/keystone-k2e-evm.dtb: Warning (unit_address_vs_reg): Node /soc has a reg or ranges property, but no unit name
arch/arm/boot/dts/keystone-k2g-evm.dtb: Warning (unit_address_vs_reg): Node /soc has a reg or ranges property, but no unit name
arch/arm/boot/dts/keystone-k2g-ice.dtb: Warning (unit_address_vs_reg): Node /soc has a reg or ranges property, but no unit name

NOTE: Though we can reformat files by reducing 1 level of indent due to
the use of soc0 phandle, we omit that change to prevent un-necessary
churn in code base.

Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>

diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts
index 5378b85..66fec5f 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2e-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2e-evm.dts
@@ -25,8 +25,9 @@
                        status = "okay";
                };
        };
+};
 
-       soc {
+&soc0 {
 
                clocks {
                        refclksys: refclksys {
@@ -50,7 +51,6 @@
                                clock-output-names = "refclk-ddr3a";
                        };
                };
-       };
 };
 
 &usb_phy {

diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi
index db4560b..0bcd3f8 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2e.dtsi
+++ b/arch/arm/boot/dts/keystone-k2e.dtsi
@@ -45,8 +45,9 @@
        aliases {
                rproc0 = &dsp0;
        };
+};
 
-       soc {
+&soc0 {
                /include/ "keystone-k2e-clocks.dtsi"
 
                usb: usb@2680000 {
@@ -191,5 +192,4 @@
                        bus_freq        = <2500000>;
                };
                /include/ "keystone-k2e-netcp.dtsi"
-       };
 };

diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi
index 8b04652..fd06171 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@ -69,7 +69,7 @@
                interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
        };
 
-       soc {
+       soc0: soc@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                #pinctrl-cells = <1>;

diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts
index 8ea5a58..ad4e22a 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2hk-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts
@@ -26,7 +26,31 @@
                };
        };
 
-       soc {
+       leds {
+               compatible = "gpio-leds";
+               debug1_1 {
+                       label = "keystone:green:debug1";
+                       gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */
+               };
+
+               debug1_2 {
+                       label = "keystone:red:debug1";
+                       gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */
+               };
+
+               debug2 {
+                       label = "keystone:blue:debug2";
+                       gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */
+               };
+
+               debug3 {
+                       label = "keystone:blue:debug3";
+                       gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */
+               };
+       };
+};
+
+&soc0 {
                clocks {
                        refclksys: refclksys {
                                #clock-cells = <0>;
@@ -63,30 +87,6 @@
                                clock-output-names = "refclk-ddr3b";
                        };
                };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               debug1_1 {
-                       label = "keystone:green:debug1";
-                       gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */
-               };
-
-               debug1_2 {
-                       label = "keystone:red:debug1";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */
-               };
-
-               debug2 {
-                       label = "keystone:blue:debug2";
-                       gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */
-               };
-
-               debug3 {
-                       label = "keystone:blue:debug3";
-                       gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */
-               };
-       };
 };
 
 &usb_phy {

diff --git a/arch/arm/boot/dts/keystone-k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi
index 71c1dcf..ed59474 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2hk.dtsi
+++ b/arch/arm/boot/dts/keystone-k2hk.dtsi
@@ -52,8 +52,9 @@
                rproc6 = &dsp6;
                rproc7 = &dsp7;
        };
+};
 
-       soc {
+&soc0 {
                /include/ "keystone-k2hk-clocks.dtsi"
 
                msm_ram: msmram@c000000 {
@@ -281,5 +282,4 @@
                        bus_freq        = <2500000>;
                };
                /include/ "keystone-k2hk-netcp.dtsi"
-       };
 };

diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts
index 61f6343..e200533 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2l-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2l-evm.dts
@@ -25,8 +25,9 @@
                        status = "okay";
                };
        };
+};
 
-       soc {
+&soc0 {
                clocks {
                        refclksys: refclksys {
                                #clock-cells = <0>;
@@ -35,7 +36,6 @@
                                clock-output-names = "refclk-sys";
                        };
                };
-       };
 };
 
 &usb_phy {

diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi
index 85b5481..b61a830 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2l.dtsi
+++ b/arch/arm/boot/dts/keystone-k2l.dtsi
@@ -36,8 +36,9 @@
                rproc2 = &dsp2;
                rproc3 = &dsp3;
        };
+};
 
-       soc {
+&soc0 {
                /include/ "keystone-k2l-clocks.dtsi"
 
                uart2: serial@2348400 {
@@ -391,7 +392,6 @@
                        bus_freq        = <2500000>;
                };
                /include/ "keystone-k2l-netcp.dtsi"
-       };
 };
 
 &spi0 {

diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index ca2cc5d..0e8d094 100644 (file)
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -67,7 +67,7 @@
                cpu_on          = <0x84000003>;
        };
 
-       soc {
+       soc0: soc@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "ti,keystone","simple-bus";