ARM: OMAP2+: Drop legacy platform data for am4 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/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 204556144ce73c6fe529edfbec4a4a0c610c492d..ab70722e866f784d1fc960300dc406337c1eb54f 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -503,23 +503,33 @@
                        };
                };
 
-               ocmcram: sram@40300000 {
-                       compatible = "mmio-sram";
-                       reg = <0x40300000 0x40000>; /* 256k */
-                       ranges = <0x0 0x40300000 0x40000>;
+               target-module@40300000 {
+                       compatible = "ti,sysc-omap4-simple", "ti,sysc";
+                       clocks = <&l3_clkctrl AM4_L3_OCMCRAM_CLKCTRL 0>;
+                       clock-names = "fck";
+                       ti,no-idle;
                        #address-cells = <1>;
                        #size-cells = <1>;
+                       ranges = <0 0x40300000 0x40000>;
 
-                       pm_sram_code: pm-code-sram@0 {
-                               compatible = "ti,sram";
-                               reg = <0x0 0x1000>;
-                               protect-exec;
-                       };
+                       ocmcram: sram@0 {
+                               compatible = "mmio-sram";
+                               reg = <0 0x40000>; /* 256k */
+                               ranges = <0 0 0x40000>;
+                               #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_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
index 32741de0ed716458e24dcd97a42b0832792b9abd..6b8837378fa9903a6fee85a7422172f0147c4bbc 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
@@ -73,10 +73,3 @@ struct omap_hwmod_ocp_if am33xx_l3_s__l3_main = {
        .clk            = "l3s_gclk",
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
-
-/* l3 main -> ocmc */
-struct omap_hwmod_ocp_if am33xx_l3_main__ocmc = {
-       .master         = &am33xx_l3_main_hwmod,
-       .slave          = &am33xx_ocmcram_hwmod,
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};

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 f72fb6c8cc9b51faa73d2be7bb061a9cd857493e..670c1934f8d4504cfd1da9e0136c22033c674661 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
@@ -139,24 +139,6 @@ struct omap_hwmod am33xx_prcm_hwmod = {
        .clkdm_name     = "l4_wkup_clkdm",
 };
 
-/* ocmcram */
-static struct omap_hwmod_class am33xx_ocmcram_hwmod_class = {
-       .name = "ocmcram",
-};
-
-struct omap_hwmod am33xx_ocmcram_hwmod = {
-       .name           = "ocmcram",
-       .class          = &am33xx_ocmcram_hwmod_class,
-       .clkdm_name     = "l3_clkdm",
-       .flags          = HWMOD_INIT_NO_IDLE,
-       .main_clk       = "l3_gclk",
-       .prcm           = {
-               .omap4  = {
-                       .modulemode     = MODULEMODE_SWCTRL,
-               },
-       },
-};
-
 /* 'smartreflex' class */
 static struct omap_hwmod_class am33xx_smartreflex_hwmod_class = {
        .name           = "smartreflex",
@@ -215,7 +197,6 @@ static void omap_hwmod_am43xx_clkctrl(void)
        CLKCTRL(am33xx_l4_wkup_hwmod, AM43XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l3_main_hwmod, AM43XX_CM_PER_L3_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_mpu_hwmod , AM43XX_CM_MPU_MPU_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_ocmcram_hwmod , AM43XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET);
 }
 
 void omap_hwmod_am43xx_reg(void)

diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
index a17f2b0b6583a0ba7b40f622d0213302ca194c75..9bae22d217b90d4e7b175e61434da601252fbd18 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
@@ -68,7 +68,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
        &am33xx_l3_s__l3_main,
        &am43xx_l4_wkup__smartreflex0,
        &am43xx_l4_wkup__smartreflex1,
-       &am33xx_l3_main__ocmc,
        NULL,
 };