Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Nishanth Menon and committed by
Santosh Shilimkar
eb08c33f d6392ae3

+37 -37
+2 -2
arch/arm/boot/dts/keystone-k2e-evm.dts
··· 25 25 status = "okay"; 26 26 }; 27 27 }; 28 + }; 28 29 29 - soc { 30 + &soc0 { 30 31 31 32 clocks { 32 33 refclksys: refclksys { ··· 51 50 clock-output-names = "refclk-ddr3a"; 52 51 }; 53 52 }; 54 - }; 55 53 }; 56 54 57 55 &usb_phy {
+2 -2
arch/arm/boot/dts/keystone-k2e.dtsi
··· 45 45 aliases { 46 46 rproc0 = &dsp0; 47 47 }; 48 + }; 48 49 49 - soc { 50 + &soc0 { 50 51 /include/ "keystone-k2e-clocks.dtsi" 51 52 52 53 usb: usb@2680000 { ··· 192 191 bus_freq = <2500000>; 193 192 }; 194 193 /include/ "keystone-k2e-netcp.dtsi" 195 - }; 196 194 };
+1 -1
arch/arm/boot/dts/keystone-k2g.dtsi
··· 69 69 interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>; 70 70 }; 71 71 72 - soc { 72 + soc0: soc@0 { 73 73 #address-cells = <1>; 74 74 #size-cells = <1>; 75 75 #pinctrl-cells = <1>;
+25 -25
arch/arm/boot/dts/keystone-k2hk-evm.dts
··· 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 54 clocks { 31 55 refclksys: refclksys { 32 56 #clock-cells = <0>; ··· 87 63 clock-output-names = "refclk-ddr3b"; 88 64 }; 89 65 }; 90 - }; 91 - 92 - leds { 93 - compatible = "gpio-leds"; 94 - debug1_1 { 95 - label = "keystone:green:debug1"; 96 - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */ 97 - }; 98 - 99 - debug1_2 { 100 - label = "keystone:red:debug1"; 101 - gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */ 102 - }; 103 - 104 - debug2 { 105 - label = "keystone:blue:debug2"; 106 - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */ 107 - }; 108 - 109 - debug3 { 110 - label = "keystone:blue:debug3"; 111 - gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */ 112 - }; 113 - }; 114 66 }; 115 67 116 68 &usb_phy {
+2 -2
arch/arm/boot/dts/keystone-k2hk.dtsi
··· 52 52 rproc6 = &dsp6; 53 53 rproc7 = &dsp7; 54 54 }; 55 + }; 55 56 56 - soc { 57 + &soc0 { 57 58 /include/ "keystone-k2hk-clocks.dtsi" 58 59 59 60 msm_ram: msmram@c000000 { ··· 282 281 bus_freq = <2500000>; 283 282 }; 284 283 /include/ "keystone-k2hk-netcp.dtsi" 285 - }; 286 284 };
+2 -2
arch/arm/boot/dts/keystone-k2l-evm.dts
··· 25 25 status = "okay"; 26 26 }; 27 27 }; 28 + }; 28 29 29 - soc { 30 + &soc0 { 30 31 clocks { 31 32 refclksys: refclksys { 32 33 #clock-cells = <0>; ··· 36 35 clock-output-names = "refclk-sys"; 37 36 }; 38 37 }; 39 - }; 40 38 }; 41 39 42 40 &usb_phy {
+2 -2
arch/arm/boot/dts/keystone-k2l.dtsi
··· 36 36 rproc2 = &dsp2; 37 37 rproc3 = &dsp3; 38 38 }; 39 + }; 39 40 40 - soc { 41 + &soc0 { 41 42 /include/ "keystone-k2l-clocks.dtsi" 42 43 43 44 uart2: serial@2348400 { ··· 392 391 bus_freq = <2500000>; 393 392 }; 394 393 /include/ "keystone-k2l-netcp.dtsi" 395 - }; 396 394 }; 397 395 398 396 &spi0 {
+1 -1
arch/arm/boot/dts/keystone.dtsi
··· 67 67 cpu_on = <0x84000003>; 68 68 }; 69 69 70 - soc { 70 + soc0: soc@0 { 71 71 #address-cells = <1>; 72 72 #size-cells = <1>; 73 73 compatible = "ti,keystone","simple-bus";