diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 04:58:50 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 04:58:50 -0500 |
commit | 8267e2e0fba74a944f9d0c9afd7779eb7272f5e7 (patch) | |
tree | 0d14a857da68101cbf69ee2a39e8bdac31a2a12c /arch/arm/mach-s5pv310/cpu.c | |
parent | fa353e9f409340cefc7650854065cbcea85c347d (diff) | |
parent | b333fb16dcc50541df1930addea3eac03c838a4c (diff) |
Merge branch 'dev/s5pv310-cpufreq' into next-s5pv310
Diffstat (limited to 'arch/arm/mach-s5pv310/cpu.c')
-rw-r--r-- | arch/arm/mach-s5pv310/cpu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/cpu.c b/arch/arm/mach-s5pv310/cpu.c index 9900464082db..72092db104c5 100644 --- a/arch/arm/mach-s5pv310/cpu.c +++ b/arch/arm/mach-s5pv310/cpu.c | |||
@@ -78,6 +78,11 @@ static struct map_desc s5pv310_iodesc[] __initdata = { | |||
78 | .length = SZ_256, | 78 | .length = SZ_256, |
79 | .type = MT_DEVICE, | 79 | .type = MT_DEVICE, |
80 | }, { | 80 | }, { |
81 | .virtual = (unsigned long)S5P_VA_DMC0, | ||
82 | .pfn = __phys_to_pfn(S5PV310_PA_DMC0), | ||
83 | .length = SZ_4K, | ||
84 | .type = MT_DEVICE, | ||
85 | }, { | ||
81 | .virtual = (unsigned long)S3C_VA_UART, | 86 | .virtual = (unsigned long)S3C_VA_UART, |
82 | .pfn = __phys_to_pfn(S3C_PA_UART), | 87 | .pfn = __phys_to_pfn(S3C_PA_UART), |
83 | .length = SZ_512K, | 88 | .length = SZ_512K, |