diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2008-04-18 17:43:09 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2008-04-18 17:43:09 -0400 |
commit | 073b6ff3b94c4737c91c45ed0f0c4d40cf1cb1c8 (patch) | |
tree | f4d3e6df63e3c01f16dd4d03b160e7405ddea86c /arch/arm/mach-realview | |
parent | be4f3c8691492934c8ee03dbecb3a3a865ac6cd6 (diff) |
RealView: Move the EB GIC definitions to the board file
This is in preparation for the RealView PB11MPCore and PB1176 patches
which have different base addresses for the GIC.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm/mach-realview')
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 6d150809e27..6848e518299 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
@@ -51,13 +51,13 @@ static struct map_desc realview_eb_io_desc[] __initdata = { | |||
51 | .length = SZ_4K, | 51 | .length = SZ_4K, |
52 | .type = MT_DEVICE, | 52 | .type = MT_DEVICE, |
53 | }, { | 53 | }, { |
54 | .virtual = IO_ADDRESS(REALVIEW_GIC_CPU_BASE), | 54 | .virtual = IO_ADDRESS(REALVIEW_EB_GIC_CPU_BASE), |
55 | .pfn = __phys_to_pfn(REALVIEW_GIC_CPU_BASE), | 55 | .pfn = __phys_to_pfn(REALVIEW_EB_GIC_CPU_BASE), |
56 | .length = SZ_4K, | 56 | .length = SZ_4K, |
57 | .type = MT_DEVICE, | 57 | .type = MT_DEVICE, |
58 | }, { | 58 | }, { |
59 | .virtual = IO_ADDRESS(REALVIEW_GIC_DIST_BASE), | 59 | .virtual = IO_ADDRESS(REALVIEW_EB_GIC_DIST_BASE), |
60 | .pfn = __phys_to_pfn(REALVIEW_GIC_DIST_BASE), | 60 | .pfn = __phys_to_pfn(REALVIEW_EB_GIC_DIST_BASE), |
61 | .length = SZ_4K, | 61 | .length = SZ_4K, |
62 | .type = MT_DEVICE, | 62 | .type = MT_DEVICE, |
63 | }, { | 63 | }, { |
@@ -286,14 +286,14 @@ static void __init gic_init_irq(void) | |||
286 | 286 | ||
287 | #ifndef CONFIG_REALVIEW_EB_ARM11MP_REVB | 287 | #ifndef CONFIG_REALVIEW_EB_ARM11MP_REVB |
288 | /* board GIC, secondary */ | 288 | /* board GIC, secondary */ |
289 | gic_dist_init(1, __io_address(REALVIEW_GIC_DIST_BASE), 64); | 289 | gic_dist_init(1, __io_address(REALVIEW_EB_GIC_DIST_BASE), 64); |
290 | gic_cpu_init(1, __io_address(REALVIEW_GIC_CPU_BASE)); | 290 | gic_cpu_init(1, __io_address(REALVIEW_EB_GIC_CPU_BASE)); |
291 | gic_cascade_irq(1, IRQ_EB11MP_EB_IRQ1); | 291 | gic_cascade_irq(1, IRQ_EB11MP_EB_IRQ1); |
292 | #endif | 292 | #endif |
293 | } else { | 293 | } else { |
294 | /* board GIC, primary */ | 294 | /* board GIC, primary */ |
295 | gic_cpu_base_addr = __io_address(REALVIEW_GIC_CPU_BASE); | 295 | gic_cpu_base_addr = __io_address(REALVIEW_EB_GIC_CPU_BASE); |
296 | gic_dist_init(0, __io_address(REALVIEW_GIC_DIST_BASE), 29); | 296 | gic_dist_init(0, __io_address(REALVIEW_EB_GIC_DIST_BASE), 29); |
297 | gic_cpu_init(0, gic_cpu_base_addr); | 297 | gic_cpu_init(0, gic_cpu_base_addr); |
298 | } | 298 | } |
299 | } | 299 | } |