aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/addr-map.c
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-09-11 08:27:19 -0400
committerJason Cooper <jason@lakedaemon.net>2012-09-21 14:03:35 -0400
commit060f3d191b1d80312d7c90de2f3c3356db413f40 (patch)
tree084ff4029442389bcdf1e4cf5c2d6081f08c458a /arch/arm/mach-kirkwood/addr-map.c
parentc3c5a2815d0b7ebde157556685a0ef8ffa34b98c (diff)
arm: mach-kirkwood: 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-kirkwood 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-kirkwood/addr-map.c')
-rw-r--r--arch/arm/mach-kirkwood/addr-map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/addr-map.c b/arch/arm/mach-kirkwood/addr-map.c
index e9a7180863d9..1b8c75c529dc 100644
--- a/arch/arm/mach-kirkwood/addr-map.c
+++ b/arch/arm/mach-kirkwood/addr-map.c
@@ -41,7 +41,7 @@
41static struct __initdata orion_addr_map_cfg addr_map_cfg = { 41static struct __initdata orion_addr_map_cfg addr_map_cfg = {
42 .num_wins = 8, 42 .num_wins = 8,
43 .remappable_wins = 4, 43 .remappable_wins = 4,
44 .bridge_virt_base = BRIDGE_VIRT_BASE, 44 .bridge_virt_base = (unsigned long) BRIDGE_VIRT_BASE,
45}; 45};
46 46
47static const struct __initdata orion_addr_map_info addr_map_info[] = { 47static const struct __initdata orion_addr_map_info addr_map_info[] = {