summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMyungJoo Ham <myungjoo.ham@samsung.com>2011-12-01 15:12:30 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-03-10 07:26:57 -0800
commit2bde0b08cae739056d1c136839b67eec0ac0c3a4 (patch)
treee105c357bfc216d5a184a0ba96a270ea8edac454 /arch
parent75ac7284c980ccb3f0e2ab21fe8acf3818317bc3 (diff)
downloadlinux-stable-2bde0b08cae739056d1c136839b67eec0ac0c3a4.tar.gz
linux-stable-2bde0b08cae739056d1c136839b67eec0ac0c3a4.tar.bz2
linux-stable-2bde0b08cae739056d1c136839b67eec0ac0c3a4.zip
ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
- Add DMC1 - Enlarge address space for DMC from 4k to 64k so that PPMU registers may be accessed. Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-exynos/common.c7
-rw-r--r--arch/arm/mach-exynos/include/mach/map.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index cb5ad8c1fea8..02696ac143bd 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -177,7 +177,12 @@ static struct map_desc exynos4_iodesc[] __initdata = {
}, {
.virtual = (unsigned long)S5P_VA_DMC0,
.pfn = __phys_to_pfn(EXYNOS4_PA_DMC0),
- .length = SZ_4K,
+ .length = SZ_64K,
+ .type = MT_DEVICE,
+ }, {
+ .virtual = (unsigned long)S5P_VA_DMC1,
+ .pfn = __phys_to_pfn(EXYNOS4_PA_DMC1),
+ .length = SZ_64K,
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)S3C_VA_USB_HSPHY,
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 7df9e7456814..535f55f76920 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -59,6 +59,7 @@
#define EXYNOS4_PA_KEYPAD 0x100A0000
#define EXYNOS4_PA_DMC0 0x10400000
+#define EXYNOS4_PA_DMC1 0x10410000
#define EXYNOS4_PA_COMBINER 0x10440000