diff options
| author | Jonghwa Lee <jonghwa3.lee@samsung.com> | 2013-10-07 17:03:32 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-03-20 17:40:47 +0900 |
| commit | d4f387e760a78a9044eb1b233b14a88d191dd591 (patch) | |
| tree | 6f8222ec3c933db34e921751807728879895d199 /arch | |
| parent | dfbabd29103a46f96ffccfb3f9e48caa980f8d48 (diff) | |
| download | linux-3.10-d4f387e760a78a9044eb1b233b14a88d191dd591.tar.gz linux-3.10-d4f387e760a78a9044eb1b233b14a88d191dd591.tar.bz2 linux-3.10-d4f387e760a78a9044eb1b233b14a88d191dd591.zip | |
arm: exynos: Fix SFR base address of DMC in EXYNOS4 series.
This patch fixes DMC's physical SFR address base which is used for
static memory mapping as EXYNOS4210 and EXYNOS4x12 uses different SFR
addresses for them.
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-exynos/common.c | 30 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 7 |
2 files changed, 25 insertions, 12 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index a8b62e4c5a6..d0dcfc072e9 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -190,16 +190,6 @@ static struct map_desc exynos4_iodesc[] __initdata = { .length = SZ_4K, .type = MT_DEVICE, }, { - .virtual = (unsigned long)S5P_VA_DMC0, - .pfn = __phys_to_pfn(EXYNOS4_PA_DMC0), - .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, .pfn = __phys_to_pfn(EXYNOS4_PA_HSPHY), .length = SZ_4K, @@ -231,6 +221,16 @@ static struct map_desc exynos4210_iodesc[] __initdata = { .pfn = __phys_to_pfn(EXYNOS4210_PA_SYSRAM_NS), .length = SZ_4K, .type = MT_DEVICE, + }, { + .virtual = (unsigned long)S5P_VA_DMC0, + .pfn = __phys_to_pfn(EXYNOS4210_PA_DMC0), + .length = SZ_64K, + .type = MT_DEVICE, + }, { + .virtual = (unsigned long)S5P_VA_DMC1, + .pfn = __phys_to_pfn(EXYNOS4210_PA_DMC1), + .length = SZ_64K, + .type = MT_DEVICE, }, }; @@ -240,6 +240,16 @@ static struct map_desc exynos4x12_iodesc[] __initdata = { .pfn = __phys_to_pfn(EXYNOS4x12_PA_SYSRAM_NS), .length = SZ_4K, .type = MT_DEVICE, + }, { + .virtual = (unsigned long)S5P_VA_DMC0, + .pfn = __phys_to_pfn(EXYNOS4x12_PA_DMC0), + .length = SZ_64K, + .type = MT_DEVICE, + }, { + .virtual = (unsigned long)S5P_VA_DMC1, + .pfn = __phys_to_pfn(EXYNOS4x12_PA_DMC1), + .length = SZ_64K, + .type = MT_DEVICE, }, }; diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index e72139805bf..9d8a9b73f18 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -75,8 +75,11 @@ #define EXYNOS4_PA_KEYPAD 0x100A0000 -#define EXYNOS4_PA_DMC0 0x10400000 -#define EXYNOS4_PA_DMC1 0x10410000 +#define EXYNOS4210_PA_DMC0 0x10400000 +#define EXYNOS4210_PA_DMC1 0x10410000 + +#define EXYNOS4x12_PA_DMC0 0x10600000 +#define EXYNOS4x12_PA_DMC1 0x10610000 #define EXYNOS4_PA_COMBINER 0x10440000 #define EXYNOS5_PA_COMBINER 0x10440000 |