ARM: OMAP2+: Drop legacy platform data for omap4 des

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.

Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap4-l4.dtsi b/arch/arm/boot/dts/omap4-l4.dtsi
index aa5a0705b46081bc8492acc1e66486f425f59700..2b6eb8a4d968dc2c84f382b90d046006b724f2a6 100644 (file)
--- a/arch/arm/boot/dts/omap4-l4.dtsi
+++ b/arch/arm/boot/dts/omap4-l4.dtsi
@@ -2187,7 +2187,6 @@
 
                des_target: target-module@a5000 {       /* 0x480a5000 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "des";
                        reg = <0xa5030 0x4>,
                              <0xa5034 0x4>,
                              <0xa5038 0x4>;

diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 0a05e340cdb0c0d8032c33d7a9be54316f6d707c..f85ce74a1f4d8f8d6462b500fcd3245827d3f42c 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -858,43 +858,6 @@ static struct omap_hwmod omap44xx_emif2_hwmod = {
        },
 };
 
-
-/*
- * 'des' class for DES3DES module
- */
-static struct omap_hwmod_class_sysconfig omap44xx_des_sysc = {
-       .rev_offs       = 0x30,
-       .sysc_offs      = 0x34,
-       .syss_offs      = 0x38,
-       .sysc_flags     = SYSS_HAS_RESET_STATUS,
-};
-
-static struct omap_hwmod_class omap44xx_des_hwmod_class = {
-       .name           = "des",
-       .sysc           = &omap44xx_des_sysc,
-};
-
-static struct omap_hwmod omap44xx_des_hwmod = {
-       .name           = "des",
-       .class          = &omap44xx_des_hwmod_class,
-       .clkdm_name     = "l4_secure_clkdm",
-       .main_clk       = "l3_div_ck",
-       .prcm           = {
-               .omap4  = {
-                       .context_offs   = OMAP4_RM_L4SEC_DES3DES_CONTEXT_OFFSET,
-                       .clkctrl_offs   = OMAP4_CM_L4SEC_DES3DES_CLKCTRL_OFFSET,
-                       .modulemode     = MODULEMODE_SWCTRL,
-               },
-       },
-};
-
-static struct omap_hwmod_ocp_if omap44xx_l3_main_2__des = {
-       .master         = &omap44xx_l3_main_2_hwmod,
-       .slave          = &omap44xx_des_hwmod,
-       .clk            = "l3_div_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
 /*
  * 'fdif' class
  * face detection hw accelerator module
@@ -2951,7 +2914,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
        &omap44xx_l4_cfg__usb_tll_hs,
        &omap44xx_mpu__emif1,
        &omap44xx_mpu__emif2,
-       &omap44xx_l3_main_2__des,
        NULL,
 };