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>

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 26d4606..675d297 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -58,17 +58,6 @@
                };
        };
 
-       /*
-        * Note that 4430 needs cross trigger interface (CTI) supported
-        * before we can configure the interrupts. This means sampling
-        * events are not supported for pmu. Note that 4460 does not use
-        * CTI, see also 4460.dtsi.
-        */
-       pmu {
-               compatible = "arm,cortex-a9-pmu";
-               ti,hwmods = "debugss";
-       };
-
        gic: interrupt-controller@48241000 {
                compatible = "arm,cortex-a9-gic";
                interrupt-controller;
@@ -213,6 +202,27 @@
                        /* No child device binding, driver in staging */
                };
 
+               /*
+                * Note that 4430 needs cross trigger interface (CTI) supported
+                * before we can configure the interrupts. This means sampling
+                * events are not supported for pmu. Note that 4460 does not use
+                * CTI, see also 4460.dtsi.
+                */
+               target-module@54000000 {
+                       compatible = "ti,sysc-omap4-simple", "ti,sysc";
+                       ti,hwmods = "debugss";
+                       power-domains = <&prm_emu>;
+                       clocks = <&emu_sys_clkctrl OMAP4_DEBUGSS_CLKCTRL 0>;
+                       clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x54000000 0x1000000>;
+
+                       pmu: pmu {
+                               compatible = "arm,cortex-a9-pmu";
+                       };
+               };
+
                target-module@55082000 {
                        compatible = "ti,sysc-omap2", "ti,sysc";
                        reg = <0x55082000 0x4>,

diff --git a/arch/arm/boot/dts/omap4460.dtsi b/arch/arm/boot/dts/omap4460.dtsi
index 2d3e549..3d6db1d 100644 (file)
--- a/arch/arm/boot/dts/omap4460.dtsi
+++ b/arch/arm/boot/dts/omap4460.dtsi
@@ -26,13 +26,6 @@
                };
        };
 
-       pmu {
-               compatible = "arm,cortex-a9-pmu";
-               interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
-               ti,hwmods = "debugss";
-       };
-
        thermal-zones {
                #include "omap4-cpu-thermal.dtsi"
        };
@@ -128,4 +121,10 @@
                 <0x00030000 0x00030000 0x00010000>;
 };
 
+&pmu {
+       compatible = "arm,cortex-a9-pmu";
+       interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+                    <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+};
+
 /include/ "omap446x-clocks.dtsi"