1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 0a3d1f19077e..773a2b95a4e0 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -133,8 +133,8 @@ static struct platform_device usb_host_device = {
 
 /* USB Func CN17 */
 struct usbhs_private {
-        unsigned int phy;
-        unsigned int cr2;
+        void __iomem *phy;
+        void __iomem *cr2;
         struct renesas_usbhs_platform_info info;
 };
 
@@ -232,8 +232,8 @@ static u32 usbhs_pipe_cfg[] = {
 };
 
 static struct usbhs_private usbhs_private = {
-        .phy    = 0xe60781e0,           /* USBPHYINT */
-        .cr2    = 0xe605810c,           /* USBCR2 */
+        .phy    = IOMEM(0xe60781e0),            /* USBPHYINT */
+        .cr2    = IOMEM(0xe605810c),            /* USBCR2 */
         .info = {
                 .platform_callback = {
                         .hardware_init  = usbhs_hardware_init,
@@ -346,11 +346,11 @@ static struct resource sh_mmcif_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = gic_spi(141),
+                .start  = gic_spi(140),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
-                .start  = gic_spi(140),
+                .start  = gic_spi(141),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -765,7 +765,7 @@ static void __init kzm_init(void)
 
 static void kzm9g_restart(char mode, const char *cmd)
 {
-#define RESCNT2 0xe6188020
+#define RESCNT2 IOMEM(0xe6188020)
         /* Do soft power on reset */
         writel((1 << 31), RESCNT2);
 }