This patch adds support for OMAP SHA1/MD5 driver on OMAP2430.
Signed-off-by: David Cohen <david.cohen@xxxxxxxxxxx>
---
arch/arm/mach-omap2/devices.c | 4 ++--
drivers/crypto/Kconfig | 2 +-
include/asm-arm/arch-omap/omap24xx.h | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 5fbeeb3..0a0703a 100644
--- 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 db51172..0d4f80f 100644
--- 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 3d6673d..b9fcaae 100644
--- 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)
--
1.5.3.5
-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
