1 files changed, 10 insertions, 8 deletions

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 4ac04055c2ea..2a318eba1b07 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -49,14 +49,14 @@
 
 #define INTCP_PA_CLCD_BASE              0xc0000000
 
-#define INTCP_VA_CIC_BASE               0xf1000040
-#define INTCP_VA_PIC_BASE               0xf1400000
-#define INTCP_VA_SIC_BASE               0xfca00000
+#define INTCP_VA_CIC_BASE               IO_ADDRESS(INTEGRATOR_HDR_BASE) + 0x40
+#define INTCP_VA_PIC_BASE               IO_ADDRESS(INTEGRATOR_IC_BASE)
+#define INTCP_VA_SIC_BASE               IO_ADDRESS(0xca000000)
 
 #define INTCP_PA_ETH_BASE               0xc8000000
 #define INTCP_ETH_SIZE                  0x10
 
-#define INTCP_VA_CTRL_BASE              0xfcb00000
+#define INTCP_VA_CTRL_BASE              IO_ADDRESS(0xcb000000)
 #define INTCP_FLASHPROG                 0x04
 #define CINTEGRATOR_FLASHPROG_FLVPPEN   (1 << 0)
 #define CINTEGRATOR_FLASHPROG_FLWREN    (1 << 1)
@@ -121,12 +121,12 @@ static struct map_desc intcp_io_desc[] __initdata = {
                 .length         = SZ_4K,
                 .type           = MT_DEVICE
         }, {
-                .virtual        = 0xfca00000,
+                .virtual        = IO_ADDRESS(0xca000000),
                 .pfn            = __phys_to_pfn(0xca000000),
                 .length         = SZ_4K,
                 .type           = MT_DEVICE
         }, {
-                .virtual        = 0xfcb00000,
+                .virtual        = IO_ADDRESS(0xcb000000),
                 .pfn            = __phys_to_pfn(0xcb000000),
                 .length         = SZ_4K,
                 .type           = MT_DEVICE
@@ -394,8 +394,8 @@ static struct platform_device *intcp_devs[] __initdata = {
  */
 static unsigned int mmc_status(struct device *dev)
 {
-        unsigned int status = readl(0xfca00004);
-        writel(8, 0xfcb00008);
+        unsigned int status = readl(IO_ADDRESS(0xca000000) + 4);
+        writel(8, IO_ADDRESS(0xcb000000) + 8);
 
         return status & 8;
 }
@@ -403,6 +403,8 @@ static unsigned int mmc_status(struct device *dev)
 static struct mmc_platform_data mmc_data = {
         .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
         .status         = mmc_status,
+        .gpio_wp        = -1,
+        .gpio_cd        = -1,
 };
 
 static struct amba_device mmc_device = {