Commit eb08c33f authored by Nishanth Menon's avatar Nishanth Menon Committed by Santosh Shilimkar

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
parent d6392ae3
...@@ -25,8 +25,9 @@ dsp_common_memory: dsp-common-memory@81f800000 { ...@@ -25,8 +25,9 @@ dsp_common_memory: dsp-common-memory@81f800000 {
status = "okay"; status = "okay";
}; };
}; };
};
soc { &soc0 {
clocks { clocks {
refclksys: refclksys { refclksys: refclksys {
...@@ -50,7 +51,6 @@ refclkddr3a: refclkddr3a { ...@@ -50,7 +51,6 @@ refclkddr3a: refclkddr3a {
clock-output-names = "refclk-ddr3a"; clock-output-names = "refclk-ddr3a";
}; };
}; };
};
}; };
&usb_phy { &usb_phy {
......
...@@ -45,8 +45,9 @@ cpu@3 { ...@@ -45,8 +45,9 @@ cpu@3 {
aliases { aliases {
rproc0 = &dsp0; rproc0 = &dsp0;
}; };
};
soc { &soc0 {
/include/ "keystone-k2e-clocks.dtsi" /include/ "keystone-k2e-clocks.dtsi"
usb: usb@2680000 { usb: usb@2680000 {
...@@ -191,5 +192,4 @@ mdio: mdio@24200f00 { ...@@ -191,5 +192,4 @@ mdio: mdio@24200f00 {
bus_freq = <2500000>; bus_freq = <2500000>;
}; };
/include/ "keystone-k2e-netcp.dtsi" /include/ "keystone-k2e-netcp.dtsi"
};
}; };
...@@ -69,7 +69,7 @@ pmu { ...@@ -69,7 +69,7 @@ pmu {
interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
}; };
soc { soc0: soc@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>; #pinctrl-cells = <1>;
......
...@@ -26,7 +26,31 @@ dsp_common_memory: dsp-common-memory@81f800000 { ...@@ -26,7 +26,31 @@ dsp_common_memory: dsp-common-memory@81f800000 {
}; };
}; };
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 { clocks {
refclksys: refclksys { refclksys: refclksys {
#clock-cells = <0>; #clock-cells = <0>;
...@@ -63,30 +87,6 @@ refclkddr3b: refclkddr3b { ...@@ -63,30 +87,6 @@ refclkddr3b: refclkddr3b {
clock-output-names = "refclk-ddr3b"; 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 { &usb_phy {
......
...@@ -52,8 +52,9 @@ aliases { ...@@ -52,8 +52,9 @@ aliases {
rproc6 = &dsp6; rproc6 = &dsp6;
rproc7 = &dsp7; rproc7 = &dsp7;
}; };
};
soc { &soc0 {
/include/ "keystone-k2hk-clocks.dtsi" /include/ "keystone-k2hk-clocks.dtsi"
msm_ram: msmram@c000000 { msm_ram: msmram@c000000 {
...@@ -281,5 +282,4 @@ mdio: mdio@2090300 { ...@@ -281,5 +282,4 @@ mdio: mdio@2090300 {
bus_freq = <2500000>; bus_freq = <2500000>;
}; };
/include/ "keystone-k2hk-netcp.dtsi" /include/ "keystone-k2hk-netcp.dtsi"
};
}; };
...@@ -25,8 +25,9 @@ dsp_common_memory: dsp-common-memory@81f800000 { ...@@ -25,8 +25,9 @@ dsp_common_memory: dsp-common-memory@81f800000 {
status = "okay"; status = "okay";
}; };
}; };
};
soc { &soc0 {
clocks { clocks {
refclksys: refclksys { refclksys: refclksys {
#clock-cells = <0>; #clock-cells = <0>;
...@@ -35,7 +36,6 @@ refclksys: refclksys { ...@@ -35,7 +36,6 @@ refclksys: refclksys {
clock-output-names = "refclk-sys"; clock-output-names = "refclk-sys";
}; };
}; };
};
}; };
&usb_phy { &usb_phy {
......
...@@ -36,8 +36,9 @@ aliases { ...@@ -36,8 +36,9 @@ aliases {
rproc2 = &dsp2; rproc2 = &dsp2;
rproc3 = &dsp3; rproc3 = &dsp3;
}; };
};
soc { &soc0 {
/include/ "keystone-k2l-clocks.dtsi" /include/ "keystone-k2l-clocks.dtsi"
uart2: serial@2348400 { uart2: serial@2348400 {
...@@ -391,7 +392,6 @@ mdio: mdio@26200f00 { ...@@ -391,7 +392,6 @@ mdio: mdio@26200f00 {
bus_freq = <2500000>; bus_freq = <2500000>;
}; };
/include/ "keystone-k2l-netcp.dtsi" /include/ "keystone-k2l-netcp.dtsi"
};
}; };
&spi0 { &spi0 {
......
...@@ -67,7 +67,7 @@ psci { ...@@ -67,7 +67,7 @@ psci {
cpu_on = <0x84000003>; cpu_on = <0x84000003>;
}; };
soc { soc0: soc@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "ti,keystone","simple-bus"; compatible = "ti,keystone","simple-bus";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment