Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-omap / omap24xx.h

diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index 2e944a159ec1abdb92b2f7b941fc038ddac23ed1..3d6673da103af9f22f726559435eff0287ddcc62 100644 (file)
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -48,6 +48,7 @@
 #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)
@@ -77,17 +78,20 @@
 /* Camera */
 #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)
+
 #if defined(CONFIG_ARCH_OMAP2420)
 
 #define OMAP2_32KSYNCT_BASE    OMAP2420_32KSYNCT_BASE
 #define OMAP2_PRCM_BASE                OMAP2420_PRCM_BASE
 #define OMAP2_CM_BASE          OMAP2420_CM_BASE
 #define OMAP2_PRM_BASE         OMAP2420_PRM_BASE
-#define OMAP2_SDRC_BASE                OMAP2420_SDRC_BASE
-#define OMAP2_SMS_BASE         OMAP2420_SMS_BASE
-#define OMAP2_L4_BASE          L4_24XX_BASE
 #define OMAP2_VA_IC_BASE       IO_ADDRESS(OMAP24XX_IC_BASE)
-#define OMAP2_CTRL_BASE                OMAP2420_CTRL_BASE
 
 #elif defined(CONFIG_ARCH_OMAP2430)
 
@@ -95,20 +99,9 @@
 #define OMAP2_PRCM_BASE                OMAP2430_PRCM_BASE
 #define OMAP2_CM_BASE          OMAP2430_CM_BASE
 #define OMAP2_PRM_BASE         OMAP2430_PRM_BASE
-#define OMAP2_SDRC_BASE                OMAP243X_SDRC_BASE
-#define OMAP2_SMS_BASE         OMAP243X_SMS_BASE
-#define OMAP2_L4_BASE          L4_24XX_BASE
 #define OMAP2_VA_IC_BASE       IO_ADDRESS(OMAP24XX_IC_BASE)
-#define OMAP2_CTRL_BASE                OMAP243X_CTRL_BASE
 
 #endif
 
-/* Control module */
-#define OMAP2_CONTROL_DEVCONF0 (OMAP2_CTRL_BASE + 0x274)
-#define OMAP2_CONTROL_DEVCONF1 (OMAP2_CTRL_BASE + 0x2e8)
-#define OMAP2_CONTROL_DEVCONF   OMAP2_CONTROL_DEVCONF0
-
-#define OMAP2_CONTROL_STATUS   (OMAP2_CTRL_BASE + 0x2f8)
-
 #endif /* __ASM_ARCH_OMAP24XX_H */