ARM: msm: Silence readb/writeb warnings due to missing IOMEM()

TROUT_CPLD_BASE needs the IOMEM() treatment to avoid warnings
from the read/writeb functions.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c
index 87e1d01edecc5d35046f2e4b7fe56b3011fd3c7c..2c25050209ceddd98a280c30d7525b60bc3fc344 100644 (file)
--- a/arch/arm/mach-msm/board-trout-gpio.c
+++ b/arch/arm/mach-msm/board-trout-gpio.c
@@ -89,7 +89,7 @@ static int trout_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
                        .base             = base_gpio,                  \
                        .ngpio            = 8,                          \
                },                                                      \
-               .reg = (void *) reg_num + TROUT_CPLD_BASE,              \
+               .reg = reg_num + TROUT_CPLD_BASE,                       \
                .shadow = shadow_val,                                   \
        }
 

diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index 015d544aa01791ae811e45f581bb63ad347fec0e..5edfbd904d06e9c126a21e6dc13c8caf5f7733ff 100644 (file)
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -78,7 +78,7 @@ static void __init trout_init(void)
 
 static struct map_desc trout_io_desc[] __initdata = {
        {
-               .virtual = TROUT_CPLD_BASE,
+               .virtual = (unsigned long)TROUT_CPLD_BASE,
                .pfn     = __phys_to_pfn(TROUT_CPLD_START),
                .length  = TROUT_CPLD_SIZE,
                .type    = MT_DEVICE_NONSHARED

diff --git a/arch/arm/mach-msm/board-trout.h b/arch/arm/mach-msm/board-trout.h
index b2379ede43bcfc0d844ae25fe6a3ec925008b606..adb757abbb92a3171da9b6087fb5697ec567e9f6 100644 (file)
--- a/arch/arm/mach-msm/board-trout.h
+++ b/arch/arm/mach-msm/board-trout.h
@@ -58,7 +58,7 @@
 #define TROUT_4_TP_LS_EN    19
 #define TROUT_5_TP_LS_EN    1
 
-#define TROUT_CPLD_BASE   0xE8100000
+#define TROUT_CPLD_BASE   IOMEM(0xE8100000)
 #define TROUT_CPLD_START  0x98000000
 #define TROUT_CPLD_SIZE   SZ_4K