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

ARM: dts: Configure interconnect target module for omap4 debugss

We can now probe devices with device tree only configuration using
ti-sysc interconnect target module driver. Let's configure the
module, but keep the legacy "ti,hwmods" property to avoid new boot
time warnings. The legacy property will be removed in later patches
together with the legacy platform data.

Signed-off-by: Tony Lindgren <tony@atomide.com>

+27 -18
+21 -11
arch/arm/boot/dts/omap4.dtsi
··· 58 58 }; 59 59 }; 60 60 61 - /* 62 - * Note that 4430 needs cross trigger interface (CTI) supported 63 - * before we can configure the interrupts. This means sampling 64 - * events are not supported for pmu. Note that 4460 does not use 65 - * CTI, see also 4460.dtsi. 66 - */ 67 - pmu { 68 - compatible = "arm,cortex-a9-pmu"; 69 - ti,hwmods = "debugss"; 70 - }; 71 - 72 61 gic: interrupt-controller@48241000 { 73 62 compatible = "arm,cortex-a9-gic"; 74 63 interrupt-controller; ··· 200 211 ranges = <0 0x52000000 0x1000000>; 201 212 202 213 /* No child device binding, driver in staging */ 214 + }; 215 + 216 + /* 217 + * Note that 4430 needs cross trigger interface (CTI) supported 218 + * before we can configure the interrupts. This means sampling 219 + * events are not supported for pmu. Note that 4460 does not use 220 + * CTI, see also 4460.dtsi. 221 + */ 222 + target-module@54000000 { 223 + compatible = "ti,sysc-omap4-simple", "ti,sysc"; 224 + ti,hwmods = "debugss"; 225 + power-domains = <&prm_emu>; 226 + clocks = <&emu_sys_clkctrl OMAP4_DEBUGSS_CLKCTRL 0>; 227 + clock-names = "fck"; 228 + #address-cells = <1>; 229 + #size-cells = <1>; 230 + ranges = <0x0 0x54000000 0x1000000>; 231 + 232 + pmu: pmu { 233 + compatible = "arm,cortex-a9-pmu"; 234 + }; 203 235 }; 204 236 205 237 target-module@55082000 {
+6 -7
arch/arm/boot/dts/omap4460.dtsi
··· 26 26 }; 27 27 }; 28 28 29 - pmu { 30 - compatible = "arm,cortex-a9-pmu"; 31 - interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>, 32 - <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; 33 - ti,hwmods = "debugss"; 34 - }; 35 - 36 29 thermal-zones { 37 30 #include "omap4-cpu-thermal.dtsi" 38 31 }; ··· 119 126 <0x0002a000 0x0002a000 0x00002000>, 120 127 <0x0002c000 0x0002c000 0x00004000>, 121 128 <0x00030000 0x00030000 0x00010000>; 129 + }; 130 + 131 + &pmu { 132 + compatible = "arm,cortex-a9-pmu"; 133 + interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>, 134 + <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; 122 135 }; 123 136 124 137 /include/ "omap446x-clocks.dtsi"