summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChanghwan Youn <chaos.youn@samsung.com>2012-04-24 14:31:11 -0700
committerKukjin Kim <kgene.kim@samsung.com>2012-05-15 16:59:32 +0900
commitc9ce7dbdbf25d7245ead1923c11620d4c8013592 (patch)
tree69742ea547c3f190b1cf9d5995d89389542af5ae
parentd36bcd0790b331116cb877774dc975abf0eaa40c (diff)
downloadlinux-3.10-c9ce7dbdbf25d7245ead1923c11620d4c8013592.tar.gz
linux-3.10-c9ce7dbdbf25d7245ead1923c11620d4c8013592.tar.bz2
linux-3.10-c9ce7dbdbf25d7245ead1923c11620d4c8013592.zip
ARM: EXYNOS: Modify the GIC physical address for static io-mapping
Adapt to changes in GIC physical address in rev1 of EXYNOS5. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-exynos/common.c4
-rw-r--r--arch/arm/mach-exynos/include/mach/map.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 5ccd6e80a60..eff4446f5e3 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -265,12 +265,12 @@ static struct map_desc exynos5_iodesc[] __initdata = {
}, {
.virtual = (unsigned long)S5P_VA_GIC_CPU,
.pfn = __phys_to_pfn(EXYNOS5_PA_GIC_CPU),
- .length = SZ_64K,
+ .length = SZ_8K,
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)S5P_VA_GIC_DIST,
.pfn = __phys_to_pfn(EXYNOS5_PA_GIC_DIST),
- .length = SZ_64K,
+ .length = SZ_4K,
.type = MT_DEVICE,
},
};
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 0e2292d0455..648d59b2a0f 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -78,8 +78,8 @@
#define EXYNOS4_PA_GIC_CPU 0x10480000
#define EXYNOS4_PA_GIC_DIST 0x10490000
-#define EXYNOS5_PA_GIC_CPU 0x10480000
-#define EXYNOS5_PA_GIC_DIST 0x10490000
+#define EXYNOS5_PA_GIC_CPU 0x10482000
+#define EXYNOS5_PA_GIC_DIST 0x10481000
#define EXYNOS4_PA_COREPERI 0x10500000
#define EXYNOS4_PA_TWD 0x10500600