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

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.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 277d3455293f9287c2b12440cb0634c195d1fecd..1c528acaee4bf14c8cdce883ae538e03b85a8cb5 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -268,7 +268,6 @@
 
                aes1_target: target-module@4b501000 {
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "aes1";
                        reg = <0x4b501080 0x4>,
                              <0x4b501084 0x4>,
                              <0x4b501088 0x4>;
@@ -298,7 +297,6 @@
 
                aes2_target: target-module@4b701000 {
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "aes2";
                        reg = <0x4b701080 0x4>,
                              <0x4b701084 0x4>,
                              <0x4b701088 0x4>;

diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 292f544bd62dedce49bed8577766dc2ba3b9fa69..48ea817590562cefcb31db96f12d56aa171babf7 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -884,66 +884,6 @@ static struct omap_hwmod omap44xx_emif2_hwmod = {
        },
 };
 
-/*
-    Crypto modules AES0/1 belong to:
-       PD_L4_PER power domain
-       CD_L4_SEC clock domain
-       On the L3, the AES modules are mapped to
-       L3_CLK2: Peripherals and multimedia sub clock domain
-*/
-static struct omap_hwmod_class_sysconfig omap44xx_aes_sysc = {
-       .rev_offs       = 0x80,
-       .sysc_offs      = 0x84,
-       .syss_offs      = 0x88,
-       .sysc_flags     = SYSS_HAS_RESET_STATUS,
-};
-
-static struct omap_hwmod_class omap44xx_aes_hwmod_class = {
-       .name           = "aes",
-       .sysc           = &omap44xx_aes_sysc,
-};
-
-static struct omap_hwmod omap44xx_aes1_hwmod = {
-       .name           = "aes1",
-       .class          = &omap44xx_aes_hwmod_class,
-       .clkdm_name     = "l4_secure_clkdm",
-       .main_clk       = "l3_div_ck",
-       .prcm           = {
-               .omap4  = {
-                       .context_offs   = OMAP4_RM_L4SEC_AES1_CONTEXT_OFFSET,
-                       .clkctrl_offs   = OMAP4_CM_L4SEC_AES1_CLKCTRL_OFFSET,
-                       .modulemode     = MODULEMODE_SWCTRL,
-               },
-       },
-};
-
-static struct omap_hwmod_ocp_if omap44xx_l3_main_2__aes1 = {
-       .master         = &omap44xx_l4_per_hwmod,
-       .slave          = &omap44xx_aes1_hwmod,
-       .clk            = "l3_div_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-static struct omap_hwmod omap44xx_aes2_hwmod = {
-       .name           = "aes2",
-       .class          = &omap44xx_aes_hwmod_class,
-       .clkdm_name     = "l4_secure_clkdm",
-       .main_clk       = "l3_div_ck",
-       .prcm           = {
-               .omap4  = {
-                       .context_offs   = OMAP4_RM_L4SEC_AES2_CONTEXT_OFFSET,
-                       .clkctrl_offs   = OMAP4_CM_L4SEC_AES2_CLKCTRL_OFFSET,
-                       .modulemode     = MODULEMODE_SWCTRL,
-               },
-       },
-};
-
-static struct omap_hwmod_ocp_if omap44xx_l3_main_2__aes2 = {
-       .master         = &omap44xx_l4_per_hwmod,
-       .slave          = &omap44xx_aes2_hwmod,
-       .clk            = "l3_div_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
 
 /*
  * 'des' class for DES3DES module
@@ -3045,8 +2985,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__aes1,
-       &omap44xx_l3_main_2__aes2,
        &omap44xx_l3_main_2__des,
        &omap44xx_l3_main_2__sha0,
        NULL,