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>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index fc4285589c1f..00c318f2fce3 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -247,7 +247,7 @@ static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd,
                                  unsigned int ctrl)
 {
         struct nand_chip *this = mtd->priv;
-        unsigned long nandaddr = (unsigned long)this->IO_ADDR_W;
+        char __iomem *nandaddr = this->IO_ADDR_W;
 
         if (cmd == NAND_CMD_NONE)
                 return;
@@ -315,17 +315,17 @@ static inline void palmtx_nand_init(void) {}
  ******************************************************************************/
 static struct map_desc palmtx_io_desc[] __initdata = {
 {
-        .virtual        = PALMTX_PCMCIA_VIRT,
+        .virtual        = (unsigned long)PALMTX_PCMCIA_VIRT,
         .pfn            = __phys_to_pfn(PALMTX_PCMCIA_PHYS),
         .length         = PALMTX_PCMCIA_SIZE,
         .type           = MT_DEVICE,
 }, {
-        .virtual        = PALMTX_NAND_ALE_VIRT,
+        .virtual        = (unsigned long)PALMTX_NAND_ALE_VIRT,
         .pfn            = __phys_to_pfn(PALMTX_NAND_ALE_PHYS),
         .length         = SZ_1M,
         .type           = MT_DEVICE,
 }, {
-        .virtual        = PALMTX_NAND_CLE_VIRT,
+        .virtual        = (unsigned long)PALMTX_NAND_CLE_VIRT,
         .pfn            = __phys_to_pfn(PALMTX_NAND_CLE_PHYS),
         .length         = SZ_1M,
         .type           = MT_DEVICE,