diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-01-24 08:04:28 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-01-31 17:58:52 -0500 |
commit | 608914b37688d9a67be8b6dfc216f24d95298502 (patch) | |
tree | ef1806e434aa4e84225c7bac9cd7b2a6543042d0 | |
parent | 9d2a5e20b164052b1ca08627e30f121e6a8d3c83 (diff) |
ARM: integrator: restore static map on the CP
Commit 78d1632183454dba46ca8295484a5e7603acdc18 deleted the
static mappings of the core modules, but this static map is
still needed on the Integrator/CP (not the Integrator/AP).
Restore the static map on the Integrator/CP.
Reported-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 5e84149d1790..a3ef961e4a93 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -64,6 +64,7 @@ static void __iomem *intcp_con_base; | |||
64 | 64 | ||
65 | /* | 65 | /* |
66 | * Logical Physical | 66 | * Logical Physical |
67 | * f1000000 10000000 Core module registers | ||
67 | * f1300000 13000000 Counter/Timer | 68 | * f1300000 13000000 Counter/Timer |
68 | * f1400000 14000000 Interrupt controller | 69 | * f1400000 14000000 Interrupt controller |
69 | * f1600000 16000000 UART 0 | 70 | * f1600000 16000000 UART 0 |
@@ -75,6 +76,11 @@ static void __iomem *intcp_con_base; | |||
75 | 76 | ||
76 | static struct map_desc intcp_io_desc[] __initdata __maybe_unused = { | 77 | static struct map_desc intcp_io_desc[] __initdata __maybe_unused = { |
77 | { | 78 | { |
79 | .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE), | ||
80 | .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), | ||
81 | .length = SZ_4K, | ||
82 | .type = MT_DEVICE | ||
83 | }, { | ||
78 | .virtual = IO_ADDRESS(INTEGRATOR_CT_BASE), | 84 | .virtual = IO_ADDRESS(INTEGRATOR_CT_BASE), |
79 | .pfn = __phys_to_pfn(INTEGRATOR_CT_BASE), | 85 | .pfn = __phys_to_pfn(INTEGRATOR_CT_BASE), |
80 | .length = SZ_4K, | 86 | .length = SZ_4K, |