diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-09-11 08:27:23 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-09-21 14:04:14 -0400 |
commit | d19beac1d9358bb4a2a303f4327bf2d40ba88464 (patch) | |
tree | ee26398249ab42f5a21e861ee34b5cdde61a6f22 /arch/arm/mach-mv78xx0 | |
parent | 9758e70a448f92fb850712650a0394d8532c17ff (diff) |
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>
Diffstat (limited to 'arch/arm/mach-mv78xx0')
-rw-r--r-- | arch/arm/mach-mv78xx0/common.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index c4e3458e0674..fcda4a4f830d 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c | |||
@@ -300,8 +300,7 @@ void __init mv78xx0_sata_init(struct mv_sata_platform_data *sata_data) | |||
300 | ****************************************************************************/ | 300 | ****************************************************************************/ |
301 | void __init mv78xx0_uart0_init(void) | 301 | void __init mv78xx0_uart0_init(void) |
302 | { | 302 | { |
303 | orion_uart0_init((unsigned long) UART0_VIRT_BASE, | 303 | orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE, |
304 | UART0_PHYS_BASE, | ||
305 | IRQ_MV78XX0_UART_0, tclk); | 304 | IRQ_MV78XX0_UART_0, tclk); |
306 | } | 305 | } |
307 | 306 | ||
@@ -311,8 +310,7 @@ void __init mv78xx0_uart0_init(void) | |||
311 | ****************************************************************************/ | 310 | ****************************************************************************/ |
312 | void __init mv78xx0_uart1_init(void) | 311 | void __init mv78xx0_uart1_init(void) |
313 | { | 312 | { |
314 | orion_uart1_init((unsigned long) UART1_VIRT_BASE, | 313 | orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE, |
315 | UART1_PHYS_BASE, | ||
316 | IRQ_MV78XX0_UART_1, tclk); | 314 | IRQ_MV78XX0_UART_1, tclk); |
317 | } | 315 | } |
318 | 316 | ||
@@ -322,8 +320,7 @@ void __init mv78xx0_uart1_init(void) | |||
322 | ****************************************************************************/ | 320 | ****************************************************************************/ |
323 | void __init mv78xx0_uart2_init(void) | 321 | void __init mv78xx0_uart2_init(void) |
324 | { | 322 | { |
325 | orion_uart2_init((unsigned long) UART2_VIRT_BASE, | 323 | orion_uart2_init(UART2_VIRT_BASE, UART2_PHYS_BASE, |
326 | UART2_PHYS_BASE, | ||
327 | IRQ_MV78XX0_UART_2, tclk); | 324 | IRQ_MV78XX0_UART_2, tclk); |
328 | } | 325 | } |
329 | 326 | ||
@@ -332,8 +329,7 @@ void __init mv78xx0_uart2_init(void) | |||
332 | ****************************************************************************/ | 329 | ****************************************************************************/ |
333 | void __init mv78xx0_uart3_init(void) | 330 | void __init mv78xx0_uart3_init(void) |
334 | { | 331 | { |
335 | orion_uart3_init((unsigned long) UART3_VIRT_BASE, | 332 | orion_uart3_init(UART3_VIRT_BASE, UART3_PHYS_BASE, |
336 | UART3_PHYS_BASE, | ||
337 | IRQ_MV78XX0_UART_3, tclk); | 333 | IRQ_MV78XX0_UART_3, tclk); |
338 | } | 334 | } |
339 | 335 | ||