diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-01-24 14:04:28 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-31 14:58:52 -0800 |
| commit | 608914b37688d9a67be8b6dfc216f24d95298502 (patch) | |
| tree | ef1806e434aa4e84225c7bac9cd7b2a6543042d0 | |
| parent | 9d2a5e20b164052b1ca08627e30f121e6a8d3c83 (diff) | |
| download | linux-608914b37688d9a67be8b6dfc216f24d95298502.tar.bz2 | |
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; /* * Logical Physical + * f1000000 10000000 Core module registers * f1300000 13000000 Counter/Timer * f1400000 14000000 Interrupt controller * f1600000 16000000 UART 0 @@ -75,6 +76,11 @@ static void __iomem *intcp_con_base; static struct map_desc intcp_io_desc[] __initdata __maybe_unused = { { + .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE), + .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), + .length = SZ_4K, + .type = MT_DEVICE + }, { .virtual = IO_ADDRESS(INTEGRATOR_CT_BASE), .pfn = __phys_to_pfn(INTEGRATOR_CT_BASE), .length = SZ_4K, |