Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb08c33f authored Dec 15, 2017 by Nishanth Menon Committed by Santosh Shilimkar Dec 16, 2017

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>

parent d6392ae3

arch/arm/boot/dts/keystone-k2e-evm.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,9 @@
		status = "okay";
		};
		};
		};

		soc {
		&soc0 {

		clocks {
		refclksys: refclksys {
		@@ -51,7 +52,6 @@
		};
		};
		};
		};

		&usb_phy {
		status = "okay";

arch/arm/boot/dts/keystone-k2e.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -45,8 +45,9 @@
		aliases {
		rproc0 = &dsp0;
		};
		};

		soc {
		&soc0 {
		/include/ "keystone-k2e-clocks.dtsi"

		usb: usb@2680000 {
		@@ -192,4 +193,3 @@
		};
		/include/ "keystone-k2e-netcp.dtsi"
		};
		};

arch/arm/boot/dts/keystone-k2g.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>;

arch/arm/boot/dts/keystone-k2hk-evm.dts

+25 −25

Original line number	Diff line number	Diff line
		@@ -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>;
		@@ -65,30 +89,6 @@
		};
		};

		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 {
		status = "okay";
		};

arch/arm/boot/dts/keystone-k2hk.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,8 +52,9 @@
		rproc6 = &dsp6;
		rproc7 = &dsp7;
		};
		};

		soc {
		&soc0 {
		/include/ "keystone-k2hk-clocks.dtsi"

		msm_ram: msmram@c000000 {
		@@ -282,4 +283,3 @@
		};
		/include/ "keystone-k2hk-netcp.dtsi"
		};
		};