summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mv78xx0/common.c
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-09-11 14:27:20 +0200
committerJason Cooper <jason@lakedaemon.net>2012-09-21 18:03:44 +0000
commit383b99610e6084878930d4e4682dfc5e9141b038 (patch)
tree1a35c3cac8cbb8335ec6dcb632db4ccd7a21dc68 /arch/arm/mach-mv78xx0/common.c
parent060f3d191b1d80312d7c90de2f3c3356db413f40 (diff)
downloadlinux-383b99610e6084878930d4e4682dfc5e9141b038.tar.bz2
arm: mach-mv78xx0: 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-mv78xx0 code. Note that we introduce a few temporary additional "unsigned long" casts when calling into plat-orion functions. Those are removed by followup patches converting plat-orion functions to void __iomem pointers as well. 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/common.c')
-rw-r--r--arch/arm/mach-mv78xx0/common.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 3057f7d4329a..c4e3458e0674 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -130,17 +130,17 @@ static int get_tclk(void)
****************************************************************************/
static struct map_desc mv78xx0_io_desc[] __initdata = {
{
- .virtual = MV78XX0_CORE_REGS_VIRT_BASE,
+ .virtual = (unsigned long) MV78XX0_CORE_REGS_VIRT_BASE,
.pfn = 0,
.length = MV78XX0_CORE_REGS_SIZE,
.type = MT_DEVICE,
}, {
- .virtual = MV78XX0_PCIE_IO_VIRT_BASE(0),
+ .virtual = (unsigned long) MV78XX0_PCIE_IO_VIRT_BASE(0),
.pfn = __phys_to_pfn(MV78XX0_PCIE_IO_PHYS_BASE(0)),
.length = MV78XX0_PCIE_IO_SIZE * 8,
.type = MT_DEVICE,
}, {
- .virtual = MV78XX0_REGS_VIRT_BASE,
+ .virtual = (unsigned long) MV78XX0_REGS_VIRT_BASE,
.pfn = __phys_to_pfn(MV78XX0_REGS_PHYS_BASE),
.length = MV78XX0_REGS_SIZE,
.type = MT_DEVICE,
@@ -300,7 +300,8 @@ void __init mv78xx0_sata_init(struct mv_sata_platform_data *sata_data)
****************************************************************************/
void __init mv78xx0_uart0_init(void)
{
- orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,
+ orion_uart0_init((unsigned long) UART0_VIRT_BASE,
+ UART0_PHYS_BASE,
IRQ_MV78XX0_UART_0, tclk);
}
@@ -310,7 +311,8 @@ void __init mv78xx0_uart0_init(void)
****************************************************************************/
void __init mv78xx0_uart1_init(void)
{
- orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,
+ orion_uart1_init((unsigned long) UART1_VIRT_BASE,
+ UART1_PHYS_BASE,
IRQ_MV78XX0_UART_1, tclk);
}
@@ -320,7 +322,8 @@ void __init mv78xx0_uart1_init(void)
****************************************************************************/
void __init mv78xx0_uart2_init(void)
{
- orion_uart2_init(UART2_VIRT_BASE, UART2_PHYS_BASE,
+ orion_uart2_init((unsigned long) UART2_VIRT_BASE,
+ UART2_PHYS_BASE,
IRQ_MV78XX0_UART_2, tclk);
}
@@ -329,7 +332,8 @@ void __init mv78xx0_uart2_init(void)
****************************************************************************/
void __init mv78xx0_uart3_init(void)
{
- orion_uart3_init(UART3_VIRT_BASE, UART3_PHYS_BASE,
+ orion_uart3_init((unsigned long) UART3_VIRT_BASE,
+ UART3_PHYS_BASE,
IRQ_MV78XX0_UART_3, tclk);
}
@@ -338,12 +342,13 @@ void __init mv78xx0_uart3_init(void)
****************************************************************************/
void __init mv78xx0_init_early(void)
{
- orion_time_set_base(TIMER_VIRT_BASE);
+ orion_time_set_base((unsigned long) TIMER_VIRT_BASE);
}
static void mv78xx0_timer_init(void)
{
- orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
+ orion_time_init((unsigned long) BRIDGE_VIRT_BASE,
+ BRIDGE_INT_TIMER1_CLR,
IRQ_MV78XX0_TIMER_1, get_tclk());
}