ARM: imx: remove last explicit users of virtual base address defines

This allows changing the mapping without the need to adapt all users.

While at it remove some unneeded casts to void __iomem *, this is already
taken care for in the IO_ADDRESS macros

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

2 files changed, 5 insertions, 5 deletions

diff --git a/arch/arm/mach-mx25/devices.c b/arch/arm/mach-mx25/devices.c
index 1d0eb3e85941..92eb1a90b52c 100644
--- a/arch/arm/mach-mx25/devices.c
+++ b/arch/arm/mach-mx25/devices.c
@@ -182,22 +182,22 @@ struct platform_device mxc_pwm_device3 = {
 static struct mxc_gpio_port imx_gpio_ports[] = {
         {
                 .chip.label = "gpio-0",
-                .base = (void __iomem *)MX25_GPIO1_BASE_ADDR_VIRT,
+                .base = MX25_IO_ADDRESS(MX25_GPIO1_BASE_ADDR),
                 .irq = 52,
                 .virtual_irq_start = MXC_GPIO_IRQ_START,
         }, {
                 .chip.label = "gpio-1",
-                .base = (void __iomem *)MX25_GPIO2_BASE_ADDR_VIRT,
+                .base = MX25_IO_ADDRESS(MX25_GPIO2_BASE_ADDR),
                 .irq = 51,
                 .virtual_irq_start = MXC_GPIO_IRQ_START + 32,
         }, {
                 .chip.label = "gpio-2",
-                .base = (void __iomem *)MX25_GPIO3_BASE_ADDR_VIRT,
+                .base = MX25_IO_ADDRESS(MX25_GPIO3_BASE_ADDR),
                 .irq = 16,
                 .virtual_irq_start = MXC_GPIO_IRQ_START + 64,
         }, {
                 .chip.label = "gpio-3",
-                .base = (void __iomem *)MX25_GPIO4_BASE_ADDR_VIRT,
+                .base = MX25_IO_ADDRESS(MX25_GPIO4_BASE_ADDR),
                 .irq = 23,
                 .virtual_irq_start = MXC_GPIO_IRQ_START + 96,
         }
diff --git a/arch/arm/mach-mx25/mm.c b/arch/arm/mach-mx25/mm.c
index 11cd33599bd8..2edec6ce8fe7 100644
--- a/arch/arm/mach-mx25/mm.c
+++ b/arch/arm/mach-mx25/mm.c
@@ -56,7 +56,7 @@ int imx25_register_gpios(void);
 
 void __init mx25_init_irq(void)
 {
-        mxc_init_irq((void __iomem *)MX25_AVIC_BASE_ADDR_VIRT);
+        mxc_init_irq(MX25_IO_ADDRESS(MX25_AVIC_BASE_ADDR));
         imx25_register_gpios();
 }