Skip to content

Commit

Permalink
arm: plat-orion: use void __iomem pointers for UART registration func…
Browse files Browse the repository at this point in the history 
…tions

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>
  • Loading branch information
Thomas Petazzoni authored and Jason Cooper committed Sep 21, 2012
1 parent 9758e70 commit d19beac
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 34 deletions.
12 changes: 4 additions & 8 deletions arch/arm/mach-dove/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ void __init dove_sata_init(struct mv_sata_platform_data *sata_data)
****************************************************************************/
void __init dove_uart0_init(void)
{
orion_uart0_init((unsigned long) DOVE_UART0_VIRT_BASE,
DOVE_UART0_PHYS_BASE,
orion_uart0_init(DOVE_UART0_VIRT_BASE, DOVE_UART0_PHYS_BASE,
IRQ_DOVE_UART_0, tclk);
}

Expand All @@ -138,8 +137,7 @@ void __init dove_uart0_init(void)
****************************************************************************/
void __init dove_uart1_init(void)
{
orion_uart1_init((unsigned long) DOVE_UART1_VIRT_BASE,
DOVE_UART1_PHYS_BASE,
orion_uart1_init(DOVE_UART1_VIRT_BASE, DOVE_UART1_PHYS_BASE,
IRQ_DOVE_UART_1, tclk);
}

Expand All @@ -148,8 +146,7 @@ void __init dove_uart1_init(void)
****************************************************************************/
void __init dove_uart2_init(void)
{
orion_uart2_init((unsigned long) DOVE_UART2_VIRT_BASE,
DOVE_UART2_PHYS_BASE,
orion_uart2_init(DOVE_UART2_VIRT_BASE, DOVE_UART2_PHYS_BASE,
IRQ_DOVE_UART_2, tclk);
}

Expand All @@ -158,8 +155,7 @@ void __init dove_uart2_init(void)
****************************************************************************/
void __init dove_uart3_init(void)
{
orion_uart3_init((unsigned long) DOVE_UART3_VIRT_BASE,
DOVE_UART3_PHYS_BASE,
orion_uart3_init(DOVE_UART3_VIRT_BASE, DOVE_UART3_PHYS_BASE,
IRQ_DOVE_UART_3, tclk);
}

Expand Down
6 changes: 2 additions & 4 deletions arch/arm/mach-kirkwood/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,7 @@ void __init kirkwood_i2c_init(void)

void __init kirkwood_uart0_init(void)
{
orion_uart0_init((unsigned long) UART0_VIRT_BASE,
UART0_PHYS_BASE,
orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,
IRQ_KIRKWOOD_UART_0, tclk);
}

Expand All @@ -467,8 +466,7 @@ void __init kirkwood_uart0_init(void)
****************************************************************************/
void __init kirkwood_uart1_init(void)
{
orion_uart1_init((unsigned long) UART1_VIRT_BASE,
UART1_PHYS_BASE,
orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,
IRQ_KIRKWOOD_UART_1, tclk);
}

Expand Down
12 changes: 4 additions & 8 deletions arch/arm/mach-mv78xx0/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,7 @@ void __init mv78xx0_sata_init(struct mv_sata_platform_data *sata_data)
****************************************************************************/
void __init mv78xx0_uart0_init(void)
{
orion_uart0_init((unsigned long) UART0_VIRT_BASE,
UART0_PHYS_BASE,
orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,
IRQ_MV78XX0_UART_0, tclk);
}

Expand All @@ -311,8 +310,7 @@ void __init mv78xx0_uart0_init(void)
****************************************************************************/
void __init mv78xx0_uart1_init(void)
{
orion_uart1_init((unsigned long) UART1_VIRT_BASE,
UART1_PHYS_BASE,
orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,
IRQ_MV78XX0_UART_1, tclk);
}

Expand All @@ -322,8 +320,7 @@ void __init mv78xx0_uart1_init(void)
****************************************************************************/
void __init mv78xx0_uart2_init(void)
{
orion_uart2_init((unsigned long) UART2_VIRT_BASE,
UART2_PHYS_BASE,
orion_uart2_init(UART2_VIRT_BASE, UART2_PHYS_BASE,
IRQ_MV78XX0_UART_2, tclk);
}

Expand All @@ -332,8 +329,7 @@ void __init mv78xx0_uart2_init(void)
****************************************************************************/
void __init mv78xx0_uart3_init(void)
{
orion_uart3_init((unsigned long) UART3_VIRT_BASE,
UART3_PHYS_BASE,
orion_uart3_init(UART3_VIRT_BASE, UART3_PHYS_BASE,
IRQ_MV78XX0_UART_3, tclk);
}

Expand Down
6 changes: 2 additions & 4 deletions arch/arm/mach-orion5x/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ void __init orion5x_spi_init()
****************************************************************************/
void __init orion5x_uart0_init(void)
{
orion_uart0_init((unsigned long) UART0_VIRT_BASE,
UART0_PHYS_BASE,
orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,
IRQ_ORION5X_UART0, tclk);
}

Expand All @@ -166,8 +165,7 @@ void __init orion5x_uart0_init(void)
****************************************************************************/
void __init orion5x_uart1_init(void)
{
orion_uart1_init((unsigned long) UART1_VIRT_BASE,
UART1_PHYS_BASE,
orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,
IRQ_ORION5X_UART1, tclk);
}

Expand Down
12 changes: 6 additions & 6 deletions arch/arm/plat-orion/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/plat-orion/include/plat/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit d19beac

Please sign in to comment.