4 files changed, 13 insertions, 11 deletions

diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c
index a472777e9eba..41383bf03d4b 100644
--- a/arch/arm/mach-ep93xx/adssphere.c
+++ b/arch/arm/mach-ep93xx/adssphere.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/sizes.h>
 
 #include <mach/hardware.h>
 
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c
index 437c34111155..7fd705b5efe4 100644
--- a/arch/arm/mach-ep93xx/gesbc9312.c
+++ b/arch/arm/mach-ep93xx/gesbc9312.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/sizes.h>
 
 #include <mach/hardware.h>
 
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 75cab2d7ec73..3c4c233391dc 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -21,7 +21,6 @@
 #include <linux/mtd/partitions.h>
 
 #include <mach/hardware.h>
-#include <mach/ts72xx.h>
 
 #include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
@@ -29,30 +28,31 @@
 #include <asm/mach/arch.h>
 
 #include "soc.h"
+#include "ts72xx.h"
 
 static struct map_desc ts72xx_io_desc[] __initdata = {
         {
-                .virtual        = TS72XX_MODEL_VIRT_BASE,
+                .virtual        = (unsigned long)TS72XX_MODEL_VIRT_BASE,
                 .pfn            = __phys_to_pfn(TS72XX_MODEL_PHYS_BASE),
                 .length         = TS72XX_MODEL_SIZE,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = TS72XX_OPTIONS_VIRT_BASE,
+                .virtual        = (unsigned long)TS72XX_OPTIONS_VIRT_BASE,
                 .pfn            = __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE),
                 .length         = TS72XX_OPTIONS_SIZE,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = TS72XX_OPTIONS2_VIRT_BASE,
+                .virtual        = (unsigned long)TS72XX_OPTIONS2_VIRT_BASE,
                 .pfn            = __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE),
                 .length         = TS72XX_OPTIONS2_SIZE,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = TS72XX_RTC_INDEX_VIRT_BASE,
+                .virtual        = (unsigned long)TS72XX_RTC_INDEX_VIRT_BASE,
                 .pfn            = __phys_to_pfn(TS72XX_RTC_INDEX_PHYS_BASE),
                 .length         = TS72XX_RTC_INDEX_SIZE,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = TS72XX_RTC_DATA_VIRT_BASE,
+                .virtual        = (unsigned long)TS72XX_RTC_DATA_VIRT_BASE,
                 .pfn            = __phys_to_pfn(TS72XX_RTC_DATA_PHYS_BASE),
                 .length         = TS72XX_RTC_DATA_SIZE,
                 .type           = MT_DEVICE,
diff --git a/arch/arm/mach-ep93xx/include/mach/ts72xx.h b/arch/arm/mach-ep93xx/ts72xx.h
index f1397a13e76b..071feaa30adc 100644
--- a/arch/arm/mach-ep93xx/include/mach/ts72xx.h
+++ b/arch/arm/mach-ep93xx/ts72xx.h
@@ -14,7 +14,7 @@
  */
 
 #define TS72XX_MODEL_PHYS_BASE          0x22000000
-#define TS72XX_MODEL_VIRT_BASE          0xfebff000
+#define TS72XX_MODEL_VIRT_BASE          IOMEM(0xfebff000)
 #define TS72XX_MODEL_SIZE               0x00001000
 
 #define TS72XX_MODEL_TS7200             0x00
@@ -26,7 +26,7 @@
 
 
 #define TS72XX_OPTIONS_PHYS_BASE        0x22400000
-#define TS72XX_OPTIONS_VIRT_BASE        0xfebfe000
+#define TS72XX_OPTIONS_VIRT_BASE        IOMEM(0xfebfe000)
 #define TS72XX_OPTIONS_SIZE             0x00001000
 
 #define TS72XX_OPTIONS_COM2_RS485       0x02
@@ -34,18 +34,18 @@
 
 
 #define TS72XX_OPTIONS2_PHYS_BASE       0x22800000
-#define TS72XX_OPTIONS2_VIRT_BASE       0xfebfd000
+#define TS72XX_OPTIONS2_VIRT_BASE       IOMEM(0xfebfd000)
 #define TS72XX_OPTIONS2_SIZE            0x00001000
 
 #define TS72XX_OPTIONS2_TS9420          0x04
 #define TS72XX_OPTIONS2_TS9420_BOOT     0x02
 
 
-#define TS72XX_RTC_INDEX_VIRT_BASE      0xfebf9000
+#define TS72XX_RTC_INDEX_VIRT_BASE      IOMEM(0xfebf9000)
 #define TS72XX_RTC_INDEX_PHYS_BASE      0x10800000
 #define TS72XX_RTC_INDEX_SIZE           0x00001000
 
-#define TS72XX_RTC_DATA_VIRT_BASE       0xfebf8000
+#define TS72XX_RTC_DATA_VIRT_BASE       IOMEM(0xfebf8000)
 #define TS72XX_RTC_DATA_PHYS_BASE       0x11700000
 #define TS72XX_RTC_DATA_SIZE            0x00001000