From 6c6bb63855ec75252d1f5940d67a3439d2d3d798 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Thu, 1 Dec 2011 15:12:30 +0900 Subject: [PATCH] --- yaml --- r: 295871 b: refs/heads/master c: 2bde0b08cae739056d1c136839b67eec0ac0c3a4 h: refs/heads/master i: 295869: 79a65fe586bbf0523f583626d5f315b4c88632f4 295867: dd7fc4c65a9e9e9077db26305e87c1e97490f3f1 295863: ff733488481f1d8d89bb5b1a6b70bafc4e84c9b2 295855: 68d55230cb153abfbf869ecbcdbce359861e2778 295839: 387ed7cafb7df6f3b9d47648c910ae6f5adc5075 295807: bd20f47f87ec82fa73bafad0420e813a86cd2a7d v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/common.c | 7 ++++++- trunk/arch/arm/mach-exynos/include/mach/map.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f76099499b2c..83fff5350146 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75ac7284c980ccb3f0e2ab21fe8acf3818317bc3 +refs/heads/master: 2bde0b08cae739056d1c136839b67eec0ac0c3a4 diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c index cb5ad8c1fea8..02696ac143bd 100644 --- a/trunk/arch/arm/mach-exynos/common.c +++ b/trunk/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/trunk/arch/arm/mach-exynos/include/mach/map.h b/trunk/arch/arm/mach-exynos/include/mach/map.h index 7df9e7456814..535f55f76920 100644 --- a/trunk/arch/arm/mach-exynos/include/mach/map.h +++ b/trunk/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