diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-11-02 09:14:37 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-02 09:14:37 -0500 |
| commit | 1ffedce7e83540e2d2fe1cacd1922ee337073d28 (patch) | |
| tree | 92368c0eaa9f8016824d2d8c543d12c717595746 /arch | |
| parent | 6bf7bd6967b1cdde1fe953b0edb951966799fb44 (diff) | |
[ARM] Fix Realview machine for patch 3016/1
3016/1 changed the map_desc structure to take a PFN instead of a
physical address. Fixup Realview machine support for this change.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 01b264be5029..267bb07e39b7 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
| @@ -43,14 +43,44 @@ | |||
| 43 | #include "clock.h" | 43 | #include "clock.h" |
| 44 | 44 | ||
| 45 | static struct map_desc realview_eb_io_desc[] __initdata = { | 45 | static struct map_desc realview_eb_io_desc[] __initdata = { |
| 46 | { IO_ADDRESS(REALVIEW_SYS_BASE), REALVIEW_SYS_BASE, SZ_4K, MT_DEVICE }, | 46 | { |
| 47 | { IO_ADDRESS(REALVIEW_GIC_CPU_BASE), REALVIEW_GIC_CPU_BASE, SZ_4K, MT_DEVICE }, | 47 | .virtual = IO_ADDRESS(REALVIEW_SYS_BASE), |
| 48 | { IO_ADDRESS(REALVIEW_GIC_DIST_BASE), REALVIEW_GIC_DIST_BASE, SZ_4K, MT_DEVICE }, | 48 | .pfn = __phys_to_pfn(REALVIEW_SYS_BASE), |
| 49 | { IO_ADDRESS(REALVIEW_SCTL_BASE), REALVIEW_SCTL_BASE, SZ_4K, MT_DEVICE }, | 49 | .length = SZ_4K, |
| 50 | { IO_ADDRESS(REALVIEW_TIMER0_1_BASE), REALVIEW_TIMER0_1_BASE, SZ_4K, MT_DEVICE }, | 50 | .type = MT_DEVICE, |
| 51 | { IO_ADDRESS(REALVIEW_TIMER2_3_BASE), REALVIEW_TIMER2_3_BASE, SZ_4K, MT_DEVICE }, | 51 | }, { |
| 52 | .virtual = IO_ADDRESS(REALVIEW_GIC_CPU_BASE), | ||
| 53 | .pfn = __phys_to_pfn(REALVIEW_GIC_CPU_BASE), | ||
| 54 | .length = SZ_4K, | ||
| 55 | .type = MT_DEVICE, | ||
| 56 | }, { | ||
| 57 | .virtual = IO_ADDRESS(REALVIEW_GIC_DIST_BASE), | ||
| 58 | .pfn = __phys_to_pfn(REALVIEW_GIC_DIST_BASE), | ||
| 59 | .length = SZ_4K, | ||
| 60 | .type = MT_DEVICE, | ||
| 61 | }, { | ||
| 62 | .virtual = IO_ADDRESS(REALVIEW_SCTL_BASE), | ||
| 63 | .pfn = __phys_to_pfn(REALVIEW_SCTL_BASE), | ||
| 64 | .length = SZ_4K, | ||
| 65 | .type = MT_DEVICE, | ||
| 66 | }, { | ||
| 67 | .virtual = IO_ADDRESS(REALVIEW_TIMER0_1_BASE), | ||
| 68 | .pfn = __phys_to_pfn(REALVIEW_TIMER0_1_BASE), | ||
| 69 | .length = SZ_4K, | ||
| 70 | .type = MT_DEVICE, | ||
| 71 | }, { | ||
| 72 | .virtual = IO_ADDRESS(REALVIEW_TIMER2_3_BASE), | ||
| 73 | .pfn = __phys_to_pfn(REALVIEW_TIMER2_3_BASE), | ||
| 74 | .length = SZ_4K, | ||
| 75 | .type = MT_DEVICE, | ||
| 76 | }, | ||
| 52 | #ifdef CONFIG_DEBUG_LL | 77 | #ifdef CONFIG_DEBUG_LL |
| 53 | { IO_ADDRESS(REALVIEW_UART0_BASE), REALVIEW_UART0_BASE, SZ_4K, MT_DEVICE }, | 78 | { |
| 79 | .virtual = IO_ADDRESS(REALVIEW_UART0_BASE), | ||
| 80 | .pfn = __phys_to_pfn(REALVIEW_UART0_BASE), | ||
| 81 | .length = SZ_4K, | ||
| 82 | .type = MT_DEVICE, | ||
| 83 | } | ||
| 54 | #endif | 84 | #endif |
| 55 | }; | 85 | }; |
| 56 | 86 | ||