ARM: OMAP2+: Drop legacy platform data for omap5 emif

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.

As we're just dropping data, and the early platform data init is based on
the custom ti,hwmods property, we want to drop both the platform data and
ti,hwmods property in a single patch.

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

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 592e3ee..af09a3e 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -298,7 +298,6 @@
 
                target-module@4c000000 {
                        compatible = "ti,sysc-omap4-simple", "ti,sysc";
-                       ti,hwmods = "emif1";
                        reg = <0x4c000000 0x4>;
                        reg-names = "rev";
                        clocks = <&emif_clkctrl OMAP5_EMIF1_CLKCTRL 0>;
@@ -321,7 +320,6 @@
 
                target-module@4d000000 {
                        compatible = "ti,sysc-omap4-simple", "ti,sysc";
-                       ti,hwmods = "emif2";
                        reg = <0x4d000000 0x4>;
                        reg-names = "rev";
                        clocks = <&emif_clkctrl OMAP5_EMIF2_CLKCTRL 0>;

diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 7db8475..c6e0334 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -159,55 +159,6 @@ static struct omap_hwmod omap54xx_mpu_private_hwmod = {
        },
 };
 
-/*
- * 'emif' class
- * external memory interface no1 (wrapper)
- */
-
-static struct omap_hwmod_class_sysconfig omap54xx_emif_sysc = {
-       .rev_offs       = 0x0000,
-};
-
-static struct omap_hwmod_class omap54xx_emif_hwmod_class = {
-       .name   = "emif",
-       .sysc   = &omap54xx_emif_sysc,
-};
-
-/* emif1 */
-static struct omap_hwmod omap54xx_emif1_hwmod = {
-       .name           = "emif1",
-       .class          = &omap54xx_emif_hwmod_class,
-       .clkdm_name     = "emif_clkdm",
-       .flags          = HWMOD_INIT_NO_IDLE,
-       .main_clk       = "dpll_core_h11x2_ck",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP54XX_CM_EMIF_EMIF1_CLKCTRL_OFFSET,
-                       .context_offs = OMAP54XX_RM_EMIF_EMIF1_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_HWCTRL,
-               },
-       },
-};
-
-/* emif2 */
-static struct omap_hwmod omap54xx_emif2_hwmod = {
-       .name           = "emif2",
-       .class          = &omap54xx_emif_hwmod_class,
-       .clkdm_name     = "emif_clkdm",
-       .flags          = HWMOD_INIT_NO_IDLE,
-       .main_clk       = "dpll_core_h11x2_ck",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP54XX_CM_EMIF_EMIF2_CLKCTRL_OFFSET,
-                       .context_offs = OMAP54XX_RM_EMIF_EMIF2_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_HWCTRL,
-               },
-       },
-};
-
-
-
-
 /*
  * 'mpu' class
  * mpu sub-system
@@ -385,22 +336,6 @@ static struct omap_hwmod_ocp_if omap54xx_mpu__mpu_private = {
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mpu -> emif1 */
-static struct omap_hwmod_ocp_if omap54xx_mpu__emif1 = {
-       .master         = &omap54xx_mpu_hwmod,
-       .slave          = &omap54xx_emif1_hwmod,
-       .clk            = "dpll_core_h11x2_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-/* mpu -> emif2 */
-static struct omap_hwmod_ocp_if omap54xx_mpu__emif2 = {
-       .master         = &omap54xx_mpu_hwmod,
-       .slave          = &omap54xx_emif2_hwmod,
-       .clk            = "dpll_core_h11x2_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
 /* l4_cfg -> mpu */
 static struct omap_hwmod_ocp_if omap54xx_l4_cfg__mpu = {
        .master         = &omap54xx_l4_cfg_hwmod,
@@ -423,8 +358,6 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
        &omap54xx_l3_main_2__l4_per,
        &omap54xx_l3_main_1__l4_wkup,
        &omap54xx_mpu__mpu_private,
-       &omap54xx_mpu__emif1,
-       &omap54xx_mpu__emif2,
        &omap54xx_l4_cfg__mpu,
        &omap54xx_l4_cfg__sata,
        NULL,