ARM:OMAP2: updating OMAP SHA1/MD5 driver to support OMAP2430.

This patch adds support for OMAP SHA1/MD5 driver on OMAP2430.

Signed-off-by: David Cohen <david.cohen@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 5fbeeb3f3fdf6d744d5589fae7db25cfdbd48677..0a0703a9497b2127ae7f7c79fedf044361ef8547 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -224,8 +224,8 @@ void omap_init_eac(struct eac_platform_data *pdata) {}
 #ifdef CONFIG_OMAP_SHA1_MD5
 static struct resource sha1_md5_resources[] = {
        {
-               .start  = OMAP2420_SEC_SHA1MD5_BASE,
-               .end    = OMAP2420_SEC_SHA1MD5_BASE + 0x64,
+               .start  = OMAP24XX_SEC_SHA1MD5_BASE,
+               .end    = OMAP24XX_SEC_SHA1MD5_BASE + 0x64,
                .flags  = IORESOURCE_MEM,
        },
        {

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index db511721796388a8526545baf53e98fa6eceb85c..0d4f80f3b39a52305b898943ebc3a3b62a57b3cc 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -85,7 +85,7 @@ config ZCRYPT_MONOLITHIC
 
 config OMAP_SHA1_MD5
        tristate "Support for OMAP SHA1/MD5 hw engine"
-       depends on ARCH_OMAP2420 && CRYPTO_SHA1 && CRYPTO_MD5
+       depends on ARCH_OMAP24XX && CRYPTO_SHA1 && CRYPTO_MD5
        help
          OMAP processors have SHA1/MD5 module accelerator. Select this if you
          want to use the OMAP module for SHA1/MD5 algorithms.

diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index 3d6673da103af9f22f726559435eff0287ddcc62..b9fcaae287c8a1e3865fd72bd6527d1090e56809 100644 (file)
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -48,7 +48,6 @@
 #define OMAP2420_PRM_BASE      OMAP2420_CM_BASE
 #define OMAP2420_SDRC_BASE     (L3_24XX_BASE + 0x9000)
 #define OMAP2420_SMS_BASE      0x68008000
-#define OMAP2420_SEC_BASE      (L4_24XX_BASE + 0xA0000)
 
 #define OMAP2430_32KSYNCT_BASE (L4_WK_243X_BASE + 0x20000)
 #define OMAP2430_PRCM_BASE     (L4_WK_243X_BASE + 0x6000)
@@ -79,11 +78,12 @@
 #define OMAP24XX_CAMERA_BASE   (L4_24XX_BASE + 0x52000)
 
 /* Security */
-#define OMAP2420_SEC_RNG_BASE  (OMAP2420_SEC_BASE + 0x0000)
-#define OMAP2420_SEC_DES_BASE  (OMAP2420_SEC_BASE + 0x2000)
-#define OMAP2420_SEC_SHA1MD5_BASE (OMAP2420_SEC_BASE + 0x4000)
-#define OMAP2420_SEC_AES_BASE  (OMAP2420_SEC_BASE + 0x6000)
-#define OMAP2420_SEC_PKA_BASE  (OMAP2420_SEC_BASE + 0x8000)
+#define OMAP24XX_SEC_BASE      (L4_24XX_BASE + 0xA0000)
+#define OMAP24XX_SEC_RNG_BASE  (OMAP24XX_SEC_BASE + 0x0000)
+#define OMAP24XX_SEC_DES_BASE  (OMAP24XX_SEC_BASE + 0x2000)
+#define OMAP24XX_SEC_SHA1MD5_BASE (OMAP24XX_SEC_BASE + 0x4000)
+#define OMAP24XX_SEC_AES_BASE  (OMAP24XX_SEC_BASE + 0x6000)
+#define OMAP24XX_SEC_PKA_BASE  (OMAP24XX_SEC_BASE + 0x8000)
 
 #if defined(CONFIG_ARCH_OMAP2420)