diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-10-27 16:38:22 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2012-11-07 19:00:24 -0500 |
commit | 52530343331dc111e0899bfc976f21ace5b5c95c (patch) | |
tree | 815a1e0e8950dec620bd664367edfa9f69e4099c /arch/arm/mach-highbank/highbank.c | |
parent | d3ad4a60a1b1448e59914eebefe1ccc8e64f9e2f (diff) |
ARM: highbank: use common debug_ll_io_init
Remove the platform static mapping code for uart and use the common
debug_ll_io_init function.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'arch/arm/mach-highbank/highbank.c')
-rw-r--r-- | arch/arm/mach-highbank/highbank.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 3e60e5744157..dc248167d206 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <asm/hardware/gic.h> | 35 | #include <asm/hardware/gic.h> |
36 | #include <asm/hardware/cache-l2x0.h> | 36 | #include <asm/hardware/cache-l2x0.h> |
37 | #include <asm/mach/arch.h> | 37 | #include <asm/mach/arch.h> |
38 | #include <asm/mach/map.h> | ||
38 | #include <asm/mach/time.h> | 39 | #include <asm/mach/time.h> |
39 | 40 | ||
40 | #include "core.h" | 41 | #include "core.h" |
@@ -53,11 +54,6 @@ static void __init highbank_scu_map_io(void) | |||
53 | scu_base_addr = ioremap(base, SZ_4K); | 54 | scu_base_addr = ioremap(base, SZ_4K); |
54 | } | 55 | } |
55 | 56 | ||
56 | static void __init highbank_map_io(void) | ||
57 | { | ||
58 | highbank_lluart_map_io(); | ||
59 | } | ||
60 | |||
61 | #define HB_JUMP_TABLE_PHYS(cpu) (0x40 + (0x10 * (cpu))) | 57 | #define HB_JUMP_TABLE_PHYS(cpu) (0x40 + (0x10 * (cpu))) |
62 | #define HB_JUMP_TABLE_VIRT(cpu) phys_to_virt(HB_JUMP_TABLE_PHYS(cpu)) | 58 | #define HB_JUMP_TABLE_VIRT(cpu) phys_to_virt(HB_JUMP_TABLE_PHYS(cpu)) |
63 | 59 | ||
@@ -211,7 +207,7 @@ static const char *highbank_match[] __initconst = { | |||
211 | 207 | ||
212 | DT_MACHINE_START(HIGHBANK, "Highbank") | 208 | DT_MACHINE_START(HIGHBANK, "Highbank") |
213 | .smp = smp_ops(highbank_smp_ops), | 209 | .smp = smp_ops(highbank_smp_ops), |
214 | .map_io = highbank_map_io, | 210 | .map_io = debug_ll_io_init, |
215 | .init_irq = highbank_init_irq, | 211 | .init_irq = highbank_init_irq, |
216 | .timer = &highbank_timer, | 212 | .timer = &highbank_timer, |
217 | .handle_irq = gic_handle_irq, | 213 | .handle_irq = gic_handle_irq, |