ARM: dts: Configure interconnect target module for omap4 emif

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 cccbeb3..26d4606 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -282,28 +282,50 @@
                        };
                };
 
-               emif1: emif@4c000000 {
-                       compatible = "ti,emif-4d";
-                       reg = <0x4c000000 0x100>;
-                       interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+               target-module@4c000000 {
+                       compatible = "ti,sysc-omap4-simple", "ti,sysc";
                        ti,hwmods = "emif1";
-                       ti,no-idle-on-init;
-                       phy-type = <1>;
-                       hw-caps-read-idle-ctrl;
-                       hw-caps-ll-interface;
-                       hw-caps-temp-alert;
+                       reg = <0x4c000000 0x4>;
+                       reg-names = "rev";
+                       clocks = <&l3_emif_clkctrl OMAP4_EMIF1_CLKCTRL 0>;
+                       clock-names = "fck";
+                       ti,no-idle;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x4c000000 0x1000000>;
+
+                       emif1: emif@0 {
+                               compatible = "ti,emif-4d";
+                               reg = <0 0x100>;
+                               interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+                               phy-type = <1>;
+                               hw-caps-read-idle-ctrl;
+                               hw-caps-ll-interface;
+                               hw-caps-temp-alert;
+                       };
                };
 
-               emif2: emif@4d000000 {
-                       compatible = "ti,emif-4d";
-                       reg = <0x4d000000 0x100>;
-                       interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+               target-module@4d000000 {
+                       compatible = "ti,sysc-omap4-simple", "ti,sysc";
                        ti,hwmods = "emif2";
-                       ti,no-idle-on-init;
-                       phy-type = <1>;
-                       hw-caps-read-idle-ctrl;
-                       hw-caps-ll-interface;
-                       hw-caps-temp-alert;
+                       reg = <0x4d000000 0x4>;
+                       reg-names = "rev";
+                       clocks = <&l3_emif_clkctrl OMAP4_EMIF2_CLKCTRL 0>;
+                       clock-names = "fck";
+                       ti,no-idle;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x4d000000 0x1000000>;
+
+                       emif2: emif@0 {
+                               compatible = "ti,emif-4d";
+                               reg = <0 0x100>;
+                               interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+                               phy-type = <1>;
+                               hw-caps-read-idle-ctrl;
+                               hw-caps-ll-interface;
+                               hw-caps-temp-alert;
+                       };
                };
 
                dsp: dsp {