diff options
author | Nishanth Menon <nm@ti.com> | 2017-12-15 01:09:47 -0500 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@oracle.com> | 2017-12-16 17:36:56 -0500 |
commit | eb08c33f9faebc7969206f176dc8d7e02e0e3e57 (patch) | |
tree | b3e060a557fe755e3a400ac76ab574d255c360ea | |
parent | d6392ae36be3ab5019671f57997fb3f7a189cf10 (diff) |
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>
-rw-r--r-- | arch/arm/boot/dts/keystone-k2e-evm.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/keystone-k2e.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/keystone-k2g.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/keystone-k2hk-evm.dts | 50 | ||||
-rw-r--r-- | arch/arm/boot/dts/keystone-k2hk.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/keystone-k2l-evm.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/keystone-k2l.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/keystone.dtsi | 2 |
8 files changed, 37 insertions, 37 deletions
diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts index 5378b858fb6f..66fec5f5d081 100644 --- a/arch/arm/boot/dts/keystone-k2e-evm.dts +++ b/arch/arm/boot/dts/keystone-k2e-evm.dts | |||
@@ -25,8 +25,9 @@ | |||
25 | status = "okay"; | 25 | status = "okay"; |
26 | }; | 26 | }; |
27 | }; | 27 | }; |
28 | }; | ||
28 | 29 | ||
29 | soc { | 30 | &soc0 { |
30 | 31 | ||
31 | clocks { | 32 | clocks { |
32 | refclksys: refclksys { | 33 | refclksys: refclksys { |
@@ -50,7 +51,6 @@ | |||
50 | clock-output-names = "refclk-ddr3a"; | 51 | clock-output-names = "refclk-ddr3a"; |
51 | }; | 52 | }; |
52 | }; | 53 | }; |
53 | }; | ||
54 | }; | 54 | }; |
55 | 55 | ||
56 | &usb_phy { | 56 | &usb_phy { |
diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi index db4560b929f1..0bcd3f8a9c45 100644 --- a/arch/arm/boot/dts/keystone-k2e.dtsi +++ b/arch/arm/boot/dts/keystone-k2e.dtsi | |||
@@ -45,8 +45,9 @@ | |||
45 | aliases { | 45 | aliases { |
46 | rproc0 = &dsp0; | 46 | rproc0 = &dsp0; |
47 | }; | 47 | }; |
48 | }; | ||
48 | 49 | ||
49 | soc { | 50 | &soc0 { |
50 | /include/ "keystone-k2e-clocks.dtsi" | 51 | /include/ "keystone-k2e-clocks.dtsi" |
51 | 52 | ||
52 | usb: usb@2680000 { | 53 | usb: usb@2680000 { |
@@ -191,5 +192,4 @@ | |||
191 | bus_freq = <2500000>; | 192 | bus_freq = <2500000>; |
192 | }; | 193 | }; |
193 | /include/ "keystone-k2e-netcp.dtsi" | 194 | /include/ "keystone-k2e-netcp.dtsi" |
194 | }; | ||
195 | }; | 195 | }; |
diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi index 8b04652b703f..fd061718dc0a 100644 --- a/arch/arm/boot/dts/keystone-k2g.dtsi +++ b/arch/arm/boot/dts/keystone-k2g.dtsi | |||
@@ -69,7 +69,7 @@ | |||
69 | interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>; | 69 | interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>; |
70 | }; | 70 | }; |
71 | 71 | ||
72 | soc { | 72 | soc0: soc@0 { |
73 | #address-cells = <1>; | 73 | #address-cells = <1>; |
74 | #size-cells = <1>; | 74 | #size-cells = <1>; |
75 | #pinctrl-cells = <1>; | 75 | #pinctrl-cells = <1>; |
diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts index 8ea5a584e828..ad4e22afe133 100644 --- a/arch/arm/boot/dts/keystone-k2hk-evm.dts +++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts | |||
@@ -26,7 +26,31 @@ | |||
26 | }; | 26 | }; |
27 | }; | 27 | }; |
28 | 28 | ||
29 | soc { | 29 | leds { |
30 | compatible = "gpio-leds"; | ||
31 | debug1_1 { | ||
32 | label = "keystone:green:debug1"; | ||
33 | gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */ | ||
34 | }; | ||
35 | |||
36 | debug1_2 { | ||
37 | label = "keystone:red:debug1"; | ||
38 | gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */ | ||
39 | }; | ||
40 | |||
41 | debug2 { | ||
42 | label = "keystone:blue:debug2"; | ||
43 | gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */ | ||
44 | }; | ||
45 | |||
46 | debug3 { | ||
47 | label = "keystone:blue:debug3"; | ||
48 | gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */ | ||
49 | }; | ||
50 | }; | ||
51 | }; | ||
52 | |||
53 | &soc0 { | ||
30 | clocks { | 54 | clocks { |
31 | refclksys: refclksys { | 55 | refclksys: refclksys { |
32 | #clock-cells = <0>; | 56 | #clock-cells = <0>; |
@@ -63,30 +87,6 @@ | |||
63 | clock-output-names = "refclk-ddr3b"; | 87 | clock-output-names = "refclk-ddr3b"; |
64 | }; | 88 | }; |
65 | }; | 89 | }; |
66 | }; | ||
67 | |||
68 | leds { | ||
69 | compatible = "gpio-leds"; | ||
70 | debug1_1 { | ||
71 | label = "keystone:green:debug1"; | ||
72 | gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */ | ||
73 | }; | ||
74 | |||
75 | debug1_2 { | ||
76 | label = "keystone:red:debug1"; | ||
77 | gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */ | ||
78 | }; | ||
79 | |||
80 | debug2 { | ||
81 | label = "keystone:blue:debug2"; | ||
82 | gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */ | ||
83 | }; | ||
84 | |||
85 | debug3 { | ||
86 | label = "keystone:blue:debug3"; | ||
87 | gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */ | ||
88 | }; | ||
89 | }; | ||
90 | }; | 90 | }; |
91 | 91 | ||
92 | &usb_phy { | 92 | &usb_phy { |
diff --git a/arch/arm/boot/dts/keystone-k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi index 71c1dcf4159f..ed59474522cb 100644 --- a/arch/arm/boot/dts/keystone-k2hk.dtsi +++ b/arch/arm/boot/dts/keystone-k2hk.dtsi | |||
@@ -52,8 +52,9 @@ | |||
52 | rproc6 = &dsp6; | 52 | rproc6 = &dsp6; |
53 | rproc7 = &dsp7; | 53 | rproc7 = &dsp7; |
54 | }; | 54 | }; |
55 | }; | ||
55 | 56 | ||
56 | soc { | 57 | &soc0 { |
57 | /include/ "keystone-k2hk-clocks.dtsi" | 58 | /include/ "keystone-k2hk-clocks.dtsi" |
58 | 59 | ||
59 | msm_ram: msmram@c000000 { | 60 | msm_ram: msmram@c000000 { |
@@ -281,5 +282,4 @@ | |||
281 | bus_freq = <2500000>; | 282 | bus_freq = <2500000>; |
282 | }; | 283 | }; |
283 | /include/ "keystone-k2hk-netcp.dtsi" | 284 | /include/ "keystone-k2hk-netcp.dtsi" |
284 | }; | ||
285 | }; | 285 | }; |
diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts index 61f63437b886..e200533d26a4 100644 --- a/arch/arm/boot/dts/keystone-k2l-evm.dts +++ b/arch/arm/boot/dts/keystone-k2l-evm.dts | |||
@@ -25,8 +25,9 @@ | |||
25 | status = "okay"; | 25 | status = "okay"; |
26 | }; | 26 | }; |
27 | }; | 27 | }; |
28 | }; | ||
28 | 29 | ||
29 | soc { | 30 | &soc0 { |
30 | clocks { | 31 | clocks { |
31 | refclksys: refclksys { | 32 | refclksys: refclksys { |
32 | #clock-cells = <0>; | 33 | #clock-cells = <0>; |
@@ -35,7 +36,6 @@ | |||
35 | clock-output-names = "refclk-sys"; | 36 | clock-output-names = "refclk-sys"; |
36 | }; | 37 | }; |
37 | }; | 38 | }; |
38 | }; | ||
39 | }; | 39 | }; |
40 | 40 | ||
41 | &usb_phy { | 41 | &usb_phy { |
diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi index 85b5481213d0..b61a830f4a4d 100644 --- a/arch/arm/boot/dts/keystone-k2l.dtsi +++ b/arch/arm/boot/dts/keystone-k2l.dtsi | |||
@@ -36,8 +36,9 @@ | |||
36 | rproc2 = &dsp2; | 36 | rproc2 = &dsp2; |
37 | rproc3 = &dsp3; | 37 | rproc3 = &dsp3; |
38 | }; | 38 | }; |
39 | }; | ||
39 | 40 | ||
40 | soc { | 41 | &soc0 { |
41 | /include/ "keystone-k2l-clocks.dtsi" | 42 | /include/ "keystone-k2l-clocks.dtsi" |
42 | 43 | ||
43 | uart2: serial@2348400 { | 44 | uart2: serial@2348400 { |
@@ -391,7 +392,6 @@ | |||
391 | bus_freq = <2500000>; | 392 | bus_freq = <2500000>; |
392 | }; | 393 | }; |
393 | /include/ "keystone-k2l-netcp.dtsi" | 394 | /include/ "keystone-k2l-netcp.dtsi" |
394 | }; | ||
395 | }; | 395 | }; |
396 | 396 | ||
397 | &spi0 { | 397 | &spi0 { |
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi index ca2cc5d8e3b5..0e8d094515cc 100644 --- a/arch/arm/boot/dts/keystone.dtsi +++ b/arch/arm/boot/dts/keystone.dtsi | |||
@@ -67,7 +67,7 @@ | |||
67 | cpu_on = <0x84000003>; | 67 | cpu_on = <0x84000003>; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | soc { | 70 | soc0: soc@0 { |
71 | #address-cells = <1>; | 71 | #address-cells = <1>; |
72 | #size-cells = <1>; | 72 | #size-cells = <1>; |
73 | compatible = "ti,keystone","simple-bus"; | 73 | compatible = "ti,keystone","simple-bus"; |