ARM: OMAP2xxx: hwmod: Convert AES crypto devcie data to hwmod

Convert the device data for the OMAP2 AES crypto IP from
explicit platform_data to hwmod.

CC: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
[paul@pwsan.com: fixed lines causing sparse warnings]
Signed-off-by: Paul Walmsley <paul@pwsan.com>

diff --git a/arch/arm/mach-omap2/cclock2430_data.c b/arch/arm/mach-omap2/cclock2430_data.c
index d8bb13e..5e4b037 100644 (file)
--- a/arch/arm/mach-omap2/cclock2430_data.c
+++ b/arch/arm/mach-omap2/cclock2430_data.c
@@ -1982,6 +1982,7 @@ static struct omap_clk omap2430_clks[] = {
        CLK("omap_rng", "ick",          &rng_ick),
        CLK(NULL,       "rng_ick",      &rng_ick),
        CLK("omap-aes", "ick",  &aes_ick),
+       CLK(NULL,       "aes_ick",      &aes_ick),
        CLK(NULL,       "pka_ick",      &pka_ick),
        CLK(NULL,       "usb_fck",      &usb_fck),
        CLK("musb-omap2430",    "ick",  &usbhs_ick),

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 6ff9907..c4c7d1d 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -519,28 +519,6 @@ static void __init omap_init_sham(void)
 
 #if defined(CONFIG_CRYPTO_DEV_OMAP_AES) || defined(CONFIG_CRYPTO_DEV_OMAP_AES_MODULE)
 
-#ifdef CONFIG_ARCH_OMAP2
-static struct resource omap2_aes_resources[] = {
-       {
-               .start  = OMAP24XX_SEC_AES_BASE,
-               .end    = OMAP24XX_SEC_AES_BASE + 0x4C,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .start  = OMAP24XX_DMA_AES_TX,
-               .flags  = IORESOURCE_DMA,
-       },
-       {
-               .start  = OMAP24XX_DMA_AES_RX,
-               .flags  = IORESOURCE_DMA,
-       }
-};
-static int omap2_aes_resources_sz = ARRAY_SIZE(omap2_aes_resources);
-#else
-#define omap2_aes_resources            NULL
-#define omap2_aes_resources_sz         0
-#endif
-
 #ifdef CONFIG_ARCH_OMAP3
 static struct resource omap3_aes_resources[] = {
        {
@@ -571,16 +549,23 @@ static struct platform_device aes_device = {
 static void omap_init_aes(void)
 {
        if (cpu_is_omap24xx()) {
-               aes_device.resource = omap2_aes_resources;
-               aes_device.num_resources = omap2_aes_resources_sz;
+               struct omap_hwmod *oh;
+               struct platform_device *pdev;
+
+               oh = omap_hwmod_lookup("aes");
+               if (!oh)
+                       return;
+
+               pdev = omap_device_build("omap-aes", -1, oh, NULL, 0);
+               WARN(IS_ERR(pdev), "Can't build omap_device for omap-aes\n");
        } else if (cpu_is_omap34xx()) {
                aes_device.resource = omap3_aes_resources;
                aes_device.num_resources = omap3_aes_resources_sz;
+               platform_device_register(&aes_device);
        } else {
                pr_err("%s: platform not supported\n", __func__);
                return;
        }
-       platform_device_register(&aes_device);
 }
 
 #else

diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 0c192e0..5137cc8 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -611,6 +611,7 @@ static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = {
        &omap2420_l4_core__msdi1,
        &omap2xxx_l4_core__rng,
        &omap2xxx_l4_core__sham,
+       &omap2xxx_l4_core__aes,
        &omap2420_l4_core__hdq1w,
        &omap2420_l4_wkup__counter_32k,
        &omap2420_l3__gpmc,

diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 3c19b08..4ce999e 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -964,6 +964,7 @@ static struct omap_hwmod_ocp_if *omap2430_hwmod_ocp_ifs[] __initdata = {
        &omap2430_l4_core__hdq1w,
        &omap2xxx_l4_core__rng,
        &omap2xxx_l4_core__sham,
+       &omap2xxx_l4_core__aes,
        &omap2430_l4_wkup__counter_32k,
        &omap2430_l3__gpmc,
        NULL,

diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
index 339ac27..5fd40d4 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
@@ -147,6 +147,15 @@ static struct omap_hwmod_addr_space omap2xxx_sham_addrs[] = {
        { }
 };
 
+static struct omap_hwmod_addr_space omap2xxx_aes_addrs[] = {
+       {
+               .pa_start       = 0x480a6000,
+               .pa_end         = 0x480a6000 + 0x50 - 1,
+               .flags          = ADDR_TYPE_RT
+       },
+       { }
+};
+
 /*
  * Common interconnect data
  */
@@ -407,3 +416,12 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__sham = {
        .addr           = omap2xxx_sham_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
+
+/* l4 core -> aes interface */
+struct omap_hwmod_ocp_if omap2xxx_l4_core__aes = {
+       .master         = &omap2xxx_l4_core_hwmod,
+       .slave          = &omap2xxx_aes_hwmod,
+       .clk            = "aes_ick",
+       .addr           = omap2xxx_aes_addrs,
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};

diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
index f3bdb32..c8c64b3 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@ -907,3 +907,41 @@ struct omap_hwmod omap2xxx_sham_hwmod = {
        },
        .class          = &omap2xxx_sham_class,
 };
+
+/* AES */
+
+static struct omap_hwmod_class_sysconfig omap2_aes_sysc = {
+       .rev_offs       = 0x44,
+       .sysc_offs      = 0x48,
+       .syss_offs      = 0x4c,
+       .sysc_flags     = (SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE |
+                          SYSS_HAS_RESET_STATUS),
+       .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class omap2xxx_aes_class = {
+       .name   = "aes",
+       .sysc   = &omap2_aes_sysc,
+};
+
+static struct omap_hwmod_dma_info omap2_aes_sdma_chs[] = {
+       { .name = "tx", .dma_req = 9 },
+       { .name = "rx", .dma_req = 10 },
+       { .dma_req = -1 }
+};
+
+struct omap_hwmod omap2xxx_aes_hwmod = {
+       .name           = "aes",
+       .sdma_reqs      = omap2_aes_sdma_chs,
+       .main_clk       = "l4_ck",
+       .prcm           = {
+               .omap2 = {
+                       .module_offs = CORE_MOD,
+                       .prcm_reg_id = 4,
+                       .module_bit = OMAP24XX_EN_AES_SHIFT,
+                       .idlest_reg_id = 4,
+                       .idlest_idle_bit = OMAP24XX_ST_AES_SHIFT,
+               },
+       },
+       .class          = &omap2xxx_aes_class,
+};

diff --git a/arch/arm/mach-omap2/omap_hwmod_common_data.h b/arch/arm/mach-omap2/omap_hwmod_common_data.h
index 928acd5..6e04ff7 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_common_data.h
+++ b/arch/arm/mach-omap2/omap_hwmod_common_data.h
@@ -79,6 +79,7 @@ extern struct omap_hwmod omap2xxx_counter_32k_hwmod;
 extern struct omap_hwmod omap2xxx_gpmc_hwmod;
 extern struct omap_hwmod omap2xxx_rng_hwmod;
 extern struct omap_hwmod omap2xxx_sham_hwmod;
+extern struct omap_hwmod omap2xxx_aes_hwmod;
 
 /* Common interface data across OMAP2xxx */
 extern struct omap_hwmod_ocp_if omap2xxx_l3_main__l4_core;
@@ -107,6 +108,7 @@ extern struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_rfbi;
 extern struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_venc;
 extern struct omap_hwmod_ocp_if omap2xxx_l4_core__rng;
 extern struct omap_hwmod_ocp_if omap2xxx_l4_core__sham;
+extern struct omap_hwmod_ocp_if omap2xxx_l4_core__aes;
 
 /* Common IP block data */
 extern struct omap_hwmod_dma_info omap2_uart1_sdma_reqs[];