diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-09-11 08:27:26 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-09-21 14:04:47 -0400 |
commit | 9b7b7d8b024d3e44412abbbb0206ab8f60c459ad (patch) | |
tree | 187f532e984b1a0c30153a8d110e0e97d7f0f452 /arch/arm/mach-orion5x | |
parent | e96a0309f8545d539c1bf4acd5b58727a8f39818 (diff) |
arm: plat-orion: use void __iomem pointers for addr-map functions
The functions for address mapping management 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-orion5x')
-rw-r--r-- | arch/arm/mach-orion5x/addr-map.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c index d309f53b7a0c..b5efc0fd31cb 100644 --- a/arch/arm/mach-orion5x/addr-map.c +++ b/arch/arm/mach-orion5x/addr-map.c | |||
@@ -79,7 +79,7 @@ static int __init cpu_win_can_remap(const struct orion_addr_map_cfg *cfg, | |||
79 | static struct orion_addr_map_cfg addr_map_cfg __initdata = { | 79 | static struct orion_addr_map_cfg addr_map_cfg __initdata = { |
80 | .num_wins = 8, | 80 | .num_wins = 8, |
81 | .cpu_win_can_remap = cpu_win_can_remap, | 81 | .cpu_win_can_remap = cpu_win_can_remap, |
82 | .bridge_virt_base = (unsigned long) ORION5X_BRIDGE_VIRT_BASE, | 82 | .bridge_virt_base = ORION5X_BRIDGE_VIRT_BASE, |
83 | }; | 83 | }; |
84 | 84 | ||
85 | static const struct __initdata orion_addr_map_info addr_map_info[] = { | 85 | static const struct __initdata orion_addr_map_info addr_map_info[] = { |
@@ -113,7 +113,8 @@ void __init orion5x_setup_cpu_mbus_bridge(void) | |||
113 | /* | 113 | /* |
114 | * Setup MBUS dram target info. | 114 | * Setup MBUS dram target info. |
115 | */ | 115 | */ |
116 | orion_setup_cpu_mbus_target(&addr_map_cfg, ORION5X_DDR_WINDOW_CPU_BASE); | 116 | orion_setup_cpu_mbus_target(&addr_map_cfg, |
117 | (void __iomem *) ORION5X_DDR_WINDOW_CPU_BASE); | ||
117 | } | 118 | } |
118 | 119 | ||
119 | void __init orion5x_setup_dev_boot_win(u32 base, u32 size) | 120 | void __init orion5x_setup_dev_boot_win(u32 base, u32 size) |