ARM: OMAP2+: Drop legacy platform data for am3 ocmcram

We can now probe devices with ti-sysc interconnect driver and dts
data. Let's drop the related platform data and custom ti,hwmods
dts property.

Note that we need to use "ti,no-idle" here.

Cc: Dave Gerlach <d-gerlach@ti.com>
Cc: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index f220d56..1d1cc85 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -459,23 +459,33 @@
                        };
                };
 
-               ocmcram: sram@40300000 {
-                       compatible = "mmio-sram";
-                       reg = <0x40300000 0x10000>; /* 64k */
-                       ranges = <0x0 0x40300000 0x10000>;
+               target-module@40300000 {
+                       compatible = "ti,sysc-omap4-simple", "ti,sysc";
+                       clocks = <&l3_clkctrl AM3_L3_OCMCRAM_CLKCTRL 0>;
+                       clock-names = "fck";
+                       ti,no-idle;
                        #address-cells = <1>;
                        #size-cells = <1>;
+                       ranges = <0 0x40300000 0x10000>;
 
-                       pm_sram_code: pm-code-sram@0 {
-                               compatible = "ti,sram";
-                               reg = <0x0 0x1000>;
-                               protect-exec;
-                       };
+                       ocmcram: sram@0 {
+                               compatible = "mmio-sram";
+                               reg = <0 0x10000>; /* 64k */
+                               ranges = <0 0 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       pm_sram_data: pm-data-sram@1000 {
-                               compatible = "ti,sram";
-                               reg = <0x1000 0x1000>;
-                               pool;
+                               pm_sram_code: pm-code-sram@0 {
+                                       compatible = "ti,sram";
+                                       reg = <0x0 0x1000>;
+                                       protect-exec;
+                               };
+
+                               pm_sram_data: pm-data-sram@1000 {
+                                       compatible = "ti,sram";
+                                       reg = <0x1000 0x1000>;
+                                       pool;
+                               };
                        };
                };
 

diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
index a8a72a5..3efcba4 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
@@ -229,7 +229,6 @@ static void omap_hwmod_am33xx_clkctrl(void)
        CLKCTRL(am33xx_l3_main_hwmod, AM33XX_CM_PER_L3_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_mpu_hwmod , AM33XX_CM_MPU_MPU_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l3_instr_hwmod , AM33XX_CM_PER_L3_INSTR_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_ocmcram_hwmod , AM33XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET);
 }
 
 void omap_hwmod_am33xx_reg(void)

diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index b64daae..6c4b7d3 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -153,7 +153,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
        &am33xx_l3_s__l3_main,
        &am33xx_l4_wkup__smartreflex0,
        &am33xx_l4_wkup__smartreflex1,
-       &am33xx_l3_main__ocmc,
        NULL,
 };