Merge branch 'master' of git://git.denx.de/u-boot-mips

[u-boot] / arch / arm / include / asm / arch-omap4 / omap4.h

diff --git a/arch/arm/include/asm/arch-omap4/omap4.h b/arch/arm/include/asm/arch-omap4/omap4.h
index d123d6a0d42053893c5ed8fcbafd6e27a000e1a2..79ff22cf316de5a2a7b449ce43a761e75e3c9a97 100644 (file)
--- a/arch/arm/include/asm/arch-omap4/omap4.h
+++ b/arch/arm/include/asm/arch-omap4/omap4.h
@@ -44,6 +44,8 @@
 
 /* CONTROL */
 #define CTRL_BASE              (OMAP44XX_L4_CORE_BASE + 0x2000)
+#define CONTROL_PADCONF_CORE   (OMAP44XX_L4_CORE_BASE + 0x100000)
+#define CONTROL_PADCONF_WKUP   (OMAP44XX_L4_CORE_BASE + 0x31E000)
 
 /* UART */
 #define UART1_BASE             (OMAP44XX_L4_PER_BASE + 0x6a000)
@@ -62,7 +64,7 @@
 #define SYNC_32KTIMER_BASE     (OMAP44XX_L4_WKUP_BASE + 0x4000)
 
 /* GPMC */
-#define GPMC_BASE      0x50000000
+#define OMAP44XX_GPMC_BASE     0x50000000
 
 /*
  * Hardware Register Details