arm: mach-mvebu: use IOMEM() for base address definitions

We now define all virtual base address constants using IOMEM() so that
those are naturally typed as void __iomem pointers, and we do the
necessary adjustements in the mach-mvebu code.

Signed-off-by: Thomas Petazzoni <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
Tested-by: Andrew Lunn <[email protected]>
Signed-off-by: Jason Cooper <[email protected]>

diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 4ef923b032ece941c26e6eddfd0814d0f509f117..dfe635b48136a770e6e312defdfd5afb91f316cc 100644 (file)
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -25,7 +25,7 @@
 
 static struct map_desc armada_370_xp_io_desc[] __initdata = {
        {
-               .virtual        = ARMADA_370_XP_REGS_VIRT_BASE,
+               .virtual        = (unsigned long) ARMADA_370_XP_REGS_VIRT_BASE,
                .pfn            = __phys_to_pfn(ARMADA_370_XP_REGS_PHYS_BASE),
                .length         = ARMADA_370_XP_REGS_SIZE,
                .type           = MT_DEVICE,

diff --git a/arch/arm/mach-mvebu/include/mach/armada-370-xp.h b/arch/arm/mach-mvebu/include/mach/armada-370-xp.h
index 25f0ca8d78205bfe44336c15ad06fa625d895c39..aac9bebc6b03da7f865381f1efa335a4c31532b2 100644 (file)
--- a/arch/arm/mach-mvebu/include/mach/armada-370-xp.h
+++ b/arch/arm/mach-mvebu/include/mach/armada-370-xp.h
@@ -16,7 +16,7 @@
 #define __MACH_ARMADA_370_XP_H
 
 #define ARMADA_370_XP_REGS_PHYS_BASE   0xd0000000
-#define ARMADA_370_XP_REGS_VIRT_BASE   0xfeb00000
+#define ARMADA_370_XP_REGS_VIRT_BASE   IOMEM(0xfeb00000)
 #define ARMADA_370_XP_REGS_SIZE                SZ_1M
 
 #endif /* __MACH_ARMADA_370_XP_H */