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

ARM: dts: exynos: Move pmu and timer nodes out of soc

The ARM PMU and ARM architected timer nodes are part of ARM CPU design
therefore they should not be inside the soc node. This also fixes DTC
W=1 warnings like:

arch/arm/boot/dts/exynos3250.dtsi:106.21-135.5:
Warning (simple_bus_reg): /soc/fixed-rate-clocks: missing or empty reg/ranges property
arch/arm/boot/dts/exynos3250.dtsi:676.7-680.5:
Warning (simple_bus_reg): /soc/pmu: missing or empty reg/ranges property

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>

+52 -52
+6 -6
arch/arm/boot/dts/exynos3250.dtsi
··· 97 97 }; 98 98 }; 99 99 100 + pmu { 101 + compatible = "arm,cortex-a7-pmu"; 102 + interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, 103 + <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; 104 + }; 105 + 100 106 soc: soc { 101 107 compatible = "simple-bus"; 102 108 #address-cells = <1>; ··· 677 671 <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; 678 672 #pwm-cells = <3>; 679 673 status = "disabled"; 680 - }; 681 - 682 - pmu { 683 - compatible = "arm,cortex-a7-pmu"; 684 - interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, 685 - <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; 686 674 }; 687 675 688 676 ppmu_dmc0: ppmu_dmc0@106a0000 {
+6 -6
arch/arm/boot/dts/exynos4.dtsi
··· 51 51 serial3 = &serial_3; 52 52 }; 53 53 54 + pmu: pmu { 55 + compatible = "arm,cortex-a9-pmu"; 56 + interrupt-parent = <&combiner>; 57 + interrupts = <2 2>, <3 2>; 58 + }; 59 + 54 60 soc: soc { 55 61 compatible = "simple-bus"; 56 62 #address-cells = <1>; ··· 173 167 #interrupt-cells = <2>; 174 168 interrupt-controller; 175 169 reg = <0x10440000 0x1000>; 176 - }; 177 - 178 - pmu: pmu { 179 - compatible = "arm,cortex-a9-pmu"; 180 - interrupt-parent = <&combiner>; 181 - interrupts = <2 2>, <3 2>; 182 170 }; 183 171 184 172 sys_reg: syscon@10010000 {
+20 -20
arch/arm/boot/dts/exynos5250.dtsi
··· 157 157 }; 158 158 }; 159 159 160 + pmu { 161 + compatible = "arm,cortex-a15-pmu"; 162 + interrupt-parent = <&combiner>; 163 + interrupts = <1 2>, <22 4>; 164 + }; 165 + 160 166 soc: soc { 161 167 sysram@2020000 { 162 168 compatible = "mmio-sram"; ··· 233 227 power-domains = <&pd_mau>; 234 228 }; 235 229 236 - timer { 237 - compatible = "arm,armv7-timer"; 238 - interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, 239 - <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, 240 - <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, 241 - <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; 242 - /* 243 - * Unfortunately we need this since some versions 244 - * of U-Boot on Exynos don't set the CNTFRQ register, 245 - * so we need the value from DT. 246 - */ 247 - clock-frequency = <24000000>; 248 - }; 249 - 250 230 mct@101c0000 { 251 231 compatible = "samsung,exynos4210-mct"; 252 232 reg = <0x101C0000 0x800>; ··· 255 263 <0x4 0 &gic 0 120 IRQ_TYPE_LEVEL_HIGH>, 256 264 <0x5 0 &gic 0 121 IRQ_TYPE_LEVEL_HIGH>; 257 265 }; 258 - }; 259 - 260 - pmu { 261 - compatible = "arm,cortex-a15-pmu"; 262 - interrupt-parent = <&combiner>; 263 - interrupts = <1 2>, <22 4>; 264 266 }; 265 267 266 268 pinctrl_0: pinctrl@11400000 { ··· 1082 1096 }; 1083 1097 }; 1084 1098 }; 1099 + }; 1100 + 1101 + timer { 1102 + compatible = "arm,armv7-timer"; 1103 + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, 1104 + <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, 1105 + <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, 1106 + <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; 1107 + /* 1108 + * Unfortunately we need this since some versions 1109 + * of U-Boot on Exynos don't set the CNTFRQ register, 1110 + * so we need the value from DT. 1111 + */ 1112 + clock-frequency = <24000000>; 1085 1113 }; 1086 1114 }; 1087 1115
+20 -20
arch/arm/boot/dts/exynos54xx.dtsi
··· 25 25 usbdrdphy1 = &usbdrd_phy1; 26 26 }; 27 27 28 + arm_a7_pmu: arm-a7-pmu { 29 + compatible = "arm,cortex-a7-pmu"; 30 + interrupt-parent = <&gic>; 31 + interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, 32 + <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>, 33 + <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>, 34 + <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>; 35 + status = "disabled"; 36 + }; 37 + 38 + arm_a15_pmu: arm-a15-pmu { 39 + compatible = "arm,cortex-a15-pmu"; 40 + interrupt-parent = <&combiner>; 41 + interrupts = <1 2>, 42 + <7 0>, 43 + <16 6>, 44 + <19 2>; 45 + status = "disabled"; 46 + }; 47 + 28 48 soc: soc { 29 - arm_a7_pmu: arm-a7-pmu { 30 - compatible = "arm,cortex-a7-pmu"; 31 - interrupt-parent = <&gic>; 32 - interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, 33 - <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>, 34 - <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>, 35 - <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>; 36 - status = "disabled"; 37 - }; 38 - 39 - arm_a15_pmu: arm-a15-pmu { 40 - compatible = "arm,cortex-a15-pmu"; 41 - interrupt-parent = <&combiner>; 42 - interrupts = <1 2>, 43 - <7 0>, 44 - <16 6>, 45 - <19 2>; 46 - status = "disabled"; 47 - }; 48 - 49 49 sysram@2020000 { 50 50 compatible = "mmio-sram"; 51 51 reg = <0x02020000 0x54000>;