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

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 681fee3..592e3ee 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -279,7 +279,6 @@
 
                target-module@4e000000 {
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "dmm";
                        reg = <0x4e000000 0x4>,
                              <0x4e000010 0x4>;
                        reg-names = "rev", "sysc";

diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 85b9ab4..7db8475 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -30,27 +30,6 @@
  * IP blocks
  */
 
-/*
- * 'dmm' class
- * instance(s): dmm
- */
-static struct omap_hwmod_class omap54xx_dmm_hwmod_class = {
-       .name   = "dmm",
-};
-
-/* dmm */
-static struct omap_hwmod omap54xx_dmm_hwmod = {
-       .name           = "dmm",
-       .class          = &omap54xx_dmm_hwmod_class,
-       .clkdm_name     = "emif_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP54XX_CM_EMIF_DMM_CLKCTRL_OFFSET,
-                       .context_offs = OMAP54XX_RM_EMIF_DMM_CONTEXT_OFFSET,
-               },
-       },
-};
-
 /*
  * 'l3' class
  * instance(s): l3_instr, l3_main_1, l3_main_2, l3_main_3
@@ -302,14 +281,6 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__sata = {
  * Interfaces
  */
 
-/* l3_main_1 -> dmm */
-static struct omap_hwmod_ocp_if omap54xx_l3_main_1__dmm = {
-       .master         = &omap54xx_l3_main_1_hwmod,
-       .slave          = &omap54xx_dmm_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_SDMA,
-};
-
 /* l3_main_3 -> l3_instr */
 static struct omap_hwmod_ocp_if omap54xx_l3_main_3__l3_instr = {
        .master         = &omap54xx_l3_main_3_hwmod,
@@ -439,7 +410,6 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__mpu = {
 };
 
 static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
-       &omap54xx_l3_main_1__dmm,
        &omap54xx_l3_main_3__l3_instr,
        &omap54xx_l3_main_2__l3_main_1,
        &omap54xx_l4_cfg__l3_main_1,