summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2011-09-29 23:22:02 +0200
committerNicolas Pitre <nico@fluxnic.net>2011-11-18 19:51:19 +0100
commit9ceceb652a0f1e5f45cb6c8af09267e7db875d7b (patch)
tree5166d406bd7436a9e36bf3e75500a414d667137b /arch/arm
parentARM: versatile: remove overlapping map_desc entry (diff)
downloadlinux-9ceceb652a0f1e5f45cb6c8af09267e7db875d7b.tar.xz
linux-9ceceb652a0f1e5f45cb6c8af09267e7db875d7b.zip
ARM: realview: fix map_desc alignment
REALVIEW_PBX_TILE_GIC_CPU_BASE is not 4KB aligned which causes an overlapping mapping. Use REALVIEW_PBX_TILE_SCU_BASE instead which is aligned. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-realview/realview_pbx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 63c4114afae9..a15f5d6edb87 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -98,8 +98,8 @@ static struct map_desc realview_pbx_io_desc[] __initdata = {
static struct map_desc realview_local_io_desc[] __initdata = {
{
- .virtual = IO_ADDRESS(REALVIEW_PBX_TILE_GIC_CPU_BASE),
- .pfn = __phys_to_pfn(REALVIEW_PBX_TILE_GIC_CPU_BASE),
+ .virtual = IO_ADDRESS(REALVIEW_PBX_TILE_SCU_BASE),
+ .pfn = __phys_to_pfn(REALVIEW_PBX_TILE_SCU_BASE),
.length = SZ_4K,
.type = MT_DEVICE,
}, {