arm: plat-orion: use void __iomem pointers for UART registration functions

The registration functions for UARTs now take void __iomem pointers,
so we remove the temporary "unsigned long" casts from the
mach-*/common.c files.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

2 files changed, 10 insertions, 10 deletions

diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index b8b747a9d360..5bed71139945 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -86,13 +86,13 @@ static void __init uart_complete(
         struct platform_device *orion_uart,
         struct plat_serial8250_port *data,
         struct resource *resources,
-        unsigned int membase,
+        void __iomem *membase,
         resource_size_t mapbase,
         unsigned int irq,
         struct clk *clk)
 {
         data->mapbase = mapbase;
-        data->membase = (void __iomem *)membase;
+        data->membase = membase;
         data->irq = irq;
         data->uartclk = uart_get_clk_rate(clk);
         orion_uart->dev.platform_data = data;
@@ -120,7 +120,7 @@ static struct platform_device orion_uart0 = {
         .id                     = PLAT8250_DEV_PLATFORM,
 };
 
-void __init orion_uart0_init(unsigned int membase,
+void __init orion_uart0_init(void __iomem *membase,
                              resource_size_t mapbase,
                              unsigned int irq,
                              struct clk *clk)
@@ -148,7 +148,7 @@ static struct platform_device orion_uart1 = {
         .id                     = PLAT8250_DEV_PLATFORM1,
 };
 
-void __init orion_uart1_init(unsigned int membase,
+void __init orion_uart1_init(void __iomem *membase,
                              resource_size_t mapbase,
                              unsigned int irq,
                              struct clk *clk)
@@ -176,7 +176,7 @@ static struct platform_device orion_uart2 = {
         .id                     = PLAT8250_DEV_PLATFORM2,
 };
 
-void __init orion_uart2_init(unsigned int membase,
+void __init orion_uart2_init(void __iomem *membase,
                              resource_size_t mapbase,
                              unsigned int irq,
                              struct clk *clk)
@@ -204,7 +204,7 @@ static struct platform_device orion_uart3 = {
         .id                     = 3,
 };
 
-void __init orion_uart3_init(unsigned int membase,
+void __init orion_uart3_init(void __iomem *membase,
                              resource_size_t mapbase,
                              unsigned int irq,
                              struct clk *clk)
diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
index ae2377ef63e5..6bbc3fe5f58e 100644
--- a/arch/arm/plat-orion/include/plat/common.h
+++ b/arch/arm/plat-orion/include/plat/common.h
@@ -13,22 +13,22 @@
 
 struct dsa_platform_data;
 
-void __init orion_uart0_init(unsigned int membase,
+void __init orion_uart0_init(void __iomem *membase,
                              resource_size_t mapbase,
                              unsigned int irq,
                              struct clk *clk);
 
-void __init orion_uart1_init(unsigned int membase,
+void __init orion_uart1_init(void __iomem *membase,
                              resource_size_t mapbase,
                              unsigned int irq,
                              struct clk *clk);
 
-void __init orion_uart2_init(unsigned int membase,
+void __init orion_uart2_init(void __iomem *membase,
                              resource_size_t mapbase,
                              unsigned int irq,
                              struct clk *clk);
 
-void __init orion_uart3_init(unsigned int membase,
+void __init orion_uart3_init(void __iomem *membase,
                              resource_size_t mapbase,
                              unsigned int irq,
                              struct clk *clk);