ARM: Integrator: fix Integrator/CP definitions, move to platform.h

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 8 insertions, 6 deletions

diff --git a/arch/arm/mach-integrator/include/mach/platform.h b/arch/arm/mach-integrator/include/mach/platform.h
index e00a2624f269..0e172e48bc85 100644
--- a/arch/arm/mach-integrator/include/mach/platform.h
+++ b/arch/arm/mach-integrator/include/mach/platform.h
@@ -290,12 +290,14 @@
 #define INTEGRATOR_DBG_LEDS             (INTEGRATOR_DBG_BASE + INTEGRATOR_DBG_LEDS_OFFSET)
 #define INTEGRATOR_DBG_SWITCH           (INTEGRATOR_DBG_BASE + INTEGRATOR_DBG_SWITCH_OFFSET)
 
-
-#if defined(CONFIG_ARCH_INTEGRATOR_AP)
-#define INTEGRATOR_GPIO_BASE            0x1B000000       /*  GPIO */
-#elif defined(CONFIG_ARCH_INTEGRATOR_CP)
-#define INTEGRATOR_GPIO_BASE            0xC9000000       /*  GPIO */
-#endif
+#define INTEGRATOR_AP_GPIO_BASE         0x1B000000      /* GPIO */
+
+#define INTEGRATOR_CP_MMC_BASE          0x1C000000      /* MMC */
+#define INTEGRATOR_CP_AACI_BASE         0x1D000000      /* AACI */
+#define INTEGRATOR_CP_ETH_BASE          0xC8000000      /* Ethernet */
+#define INTEGRATOR_CP_GPIO_BASE         0xC9000000      /* GPIO */
+#define INTEGRATOR_CP_SIC_BASE          0xCA000000      /* SIC */
+#define INTEGRATOR_CP_CTL_BASE          0xCB000000      /* CP system control */
 
 /* ------------------------------------------------------------------------
  *  KMI keyboard/mouse definitions