aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorChanghwan Youn <chaos.youn@samsung.com>2012-04-24 17:31:11 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-05-15 03:59:32 -0400
commitc9ce7dbdbf25d7245ead1923c11620d4c8013592 (patch)
tree69742ea547c3f190b1cf9d5995d89389542af5ae /arch/arm
parentd36bcd0790b331116cb877774dc975abf0eaa40c (diff)
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>
Diffstat (limited to 'arch/arm')
-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 5ccd6e80a607..eff4446f5e31 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 = {
265 }, { 265 }, {
266 .virtual = (unsigned long)S5P_VA_GIC_CPU, 266 .virtual = (unsigned long)S5P_VA_GIC_CPU,
267 .pfn = __phys_to_pfn(EXYNOS5_PA_GIC_CPU), 267 .pfn = __phys_to_pfn(EXYNOS5_PA_GIC_CPU),
268 .length = SZ_64K, 268 .length = SZ_8K,
269 .type = MT_DEVICE, 269 .type = MT_DEVICE,
270 }, { 270 }, {
271 .virtual = (unsigned long)S5P_VA_GIC_DIST, 271 .virtual = (unsigned long)S5P_VA_GIC_DIST,
272 .pfn = __phys_to_pfn(EXYNOS5_PA_GIC_DIST), 272 .pfn = __phys_to_pfn(EXYNOS5_PA_GIC_DIST),
273 .length = SZ_64K, 273 .length = SZ_4K,
274 .type = MT_DEVICE, 274 .type = MT_DEVICE,
275 }, 275 },
276}; 276};
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 0e2292d04550..648d59b2a0f6 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -78,8 +78,8 @@
78 78
79#define EXYNOS4_PA_GIC_CPU 0x10480000 79#define EXYNOS4_PA_GIC_CPU 0x10480000
80#define EXYNOS4_PA_GIC_DIST 0x10490000 80#define EXYNOS4_PA_GIC_DIST 0x10490000
81#define EXYNOS5_PA_GIC_CPU 0x10480000 81#define EXYNOS5_PA_GIC_CPU 0x10482000
82#define EXYNOS5_PA_GIC_DIST 0x10490000 82#define EXYNOS5_PA_GIC_DIST 0x10481000
83 83
84#define EXYNOS4_PA_COREPERI 0x10500000 84#define EXYNOS4_PA_COREPERI 0x10500000
85#define EXYNOS4_PA_TWD 0x10500600 85#define EXYNOS4_PA_TWD 0x10500600