ARM: ixp4xx: use __iomem pointers for MMIO

ARM is moving to stricter checks on readl/write functions,
so we need to use the correct types everywhere.

At the moment, this patch conflicts with other patches in linux-next,
need to sort this out.

Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index a9f80943d01f..fdf91a160884 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -53,24 +53,24 @@ static struct clock_event_device clockevent_ixp4xx;
  *************************************************************************/
 static struct map_desc ixp4xx_io_desc[] __initdata = {
         {       /* UART, Interrupt ctrl, GPIO, timers, NPEs, MACs, USB .... */
-                .virtual        = IXP4XX_PERIPHERAL_BASE_VIRT,
+                .virtual        = (unsigned long)IXP4XX_PERIPHERAL_BASE_VIRT,
                 .pfn            = __phys_to_pfn(IXP4XX_PERIPHERAL_BASE_PHYS),
                 .length         = IXP4XX_PERIPHERAL_REGION_SIZE,
                 .type           = MT_DEVICE
         }, {    /* Expansion Bus Config Registers */
-                .virtual        = IXP4XX_EXP_CFG_BASE_VIRT,
+                .virtual        = (unsigned long)IXP4XX_EXP_CFG_BASE_VIRT,
                 .pfn            = __phys_to_pfn(IXP4XX_EXP_CFG_BASE_PHYS),
                 .length         = IXP4XX_EXP_CFG_REGION_SIZE,
                 .type           = MT_DEVICE
         }, {    /* PCI Registers */
-                .virtual        = IXP4XX_PCI_CFG_BASE_VIRT,
+                .virtual        = (unsigned long)IXP4XX_PCI_CFG_BASE_VIRT,
                 .pfn            = __phys_to_pfn(IXP4XX_PCI_CFG_BASE_PHYS),
                 .length         = IXP4XX_PCI_CFG_REGION_SIZE,
                 .type           = MT_DEVICE
         },
 #ifdef CONFIG_DEBUG_LL
         {       /* Debug UART mapping */
-                .virtual        = IXP4XX_DEBUG_UART_BASE_VIRT,
+                .virtual        = (unsigned long)IXP4XX_DEBUG_UART_BASE_VIRT,
                 .pfn            = __phys_to_pfn(IXP4XX_DEBUG_UART_BASE_PHYS),
                 .length         = IXP4XX_DEBUG_UART_REGION_SIZE,
                 .type           = MT_DEVICE