ARM: pxa: use correct __iomem annotations

This tries to clear up the confusion between integers and iomem pointers
in the marvell pxa platform. MMIO addresses are supposed to be __iomem*
values, in order to let the Linux type checking work correctly. This
patch moves the cast to __iomem as far back as possible, to the place
where the MMIO virtual address windows are defined.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/pcmcia/pxa2xx_balloon3.c b/drivers/pcmcia/pxa2xx_balloon3.c
index f56d7de7c751..22a75e610f12 100644
--- a/drivers/pcmcia/pxa2xx_balloon3.c
+++ b/drivers/pcmcia/pxa2xx_balloon3.c
@@ -97,7 +97,7 @@ static void balloon3_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
 static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                                        const socket_state_t *state)
 {
-        __raw_writew(BALLOON3_CF_RESET, BALLOON3_CF_CONTROL_REG |
+        __raw_writew(BALLOON3_CF_RESET, BALLOON3_CF_CONTROL_REG +
                         ((state->flags & SS_RESET) ?
                         BALLOON3_FPGA_SETnCLR : 0));
         return 0;
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index afea9abbd678..6ce34160da78 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -34,7 +34,7 @@
 #include "regs.h"
 #include "reg_bits.h"
 
-static unsigned long virt_base_2700;
+static void __iomem *virt_base_2700;
 
 #define write_reg(val, reg) do { writel((val), (reg)); } while(0)
 
@@ -850,7 +850,7 @@ static int mbxfb_suspend(struct platform_device *dev, pm_message_t state)
 {
         /* make frame buffer memory enter self-refresh mode */
         write_reg_dly(LMPWR_MC_PWR_SRM, LMPWR);
-        while (LMPWRSTAT != LMPWRSTAT_MC_PWR_SRM)
+        while (readl(LMPWRSTAT) != LMPWRSTAT_MC_PWR_SRM)
                 ; /* empty statement */
 
         /* reset the device, since it's initial state is 'mostly sleeping' */
@@ -946,7 +946,7 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
                 ret = -EINVAL;
                 goto err3;
         }
-        virt_base_2700 = (unsigned long)mfbi->reg_virt_addr;
+        virt_base_2700 = mfbi->reg_virt_addr;
 
         mfbi->fb_virt_addr = ioremap_nocache(mfbi->fb_phys_addr,
                                              res_size(mfbi->fb_req));