Merge branch 'for-tony-mailbox'

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / omap34xx.h

diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h
index 89173f16b9b7cd95bd1d3a7c57605f051777179c..2f82e28eda0914450f3a00df11d699859a9afe0d 100644 (file)
--- a/arch/arm/plat-omap/include/mach/omap34xx.h
+++ b/arch/arm/plat-omap/include/mach/omap34xx.h
@@ -53,6 +53,8 @@
 #define OMAP34XX_HSUSB_OTG_BASE        (L4_34XX_BASE + 0xAB000)
 #define OMAP34XX_HSUSB_HOST_BASE       (L4_34XX_BASE + 0x64000)
 #define OMAP34XX_USBTLL_BASE   (L4_34XX_BASE + 0x62000)
+#define OMAP34XX_SR1_BASE      0x480C9000
+#define OMAP34XX_SR2_BASE      0x480CB000
 
 
 #if defined(CONFIG_ARCH_OMAP3430)
@@ -61,6 +63,7 @@
 #define OMAP2_CM_BASE                  OMAP3430_CM_BASE
 #define OMAP2_PRM_BASE                 OMAP3430_PRM_BASE
 #define OMAP2_VA_IC_BASE               IO_ADDRESS(OMAP34XX_IC_BASE)
+#define OMAP34XX_CAMERA_BASE           (L4_34XX_BASE + 0xBC000)
 #define OMAP34XX_MAILBOX_BASE          (L4_34XX_BASE + 0x94000)
 
 #endif