aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5p
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-10-04 07:20:21 -0400
committerKukjin Kim <kgene.kim@samsung.com>2011-10-04 07:20:21 -0400
commita1a9107deff9b9e5c615058834b74717fa87d49c (patch)
tree70686e34b8676a812a5cc63059e4ae8343ee1df1 /arch/arm/plat-s5p
parent86f82da586098f16d92b5637808c323f5455e935 (diff)
parent31451afd2480caf3ae15da56cf9fc3cb3fb821cb (diff)
Merge branch 'next-samsung-board-2' into next-samsung-devel-2
Diffstat (limited to 'arch/arm/plat-s5p')
-rw-r--r--arch/arm/plat-s5p/cpu.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c
index 909507bae2fa..7b0a28f73a68 100644
--- a/arch/arm/plat-s5p/cpu.c
+++ b/arch/arm/plat-s5p/cpu.c
@@ -34,6 +34,7 @@ static const char name_s5pc100[] = "S5PC100";
34static const char name_s5pv210[] = "S5PV210/S5PC110"; 34static const char name_s5pv210[] = "S5PV210/S5PC110";
35static const char name_exynos4210[] = "EXYNOS4210"; 35static const char name_exynos4210[] = "EXYNOS4210";
36static const char name_exynos4212[] = "EXYNOS4212"; 36static const char name_exynos4212[] = "EXYNOS4212";
37static const char name_exynos4412[] = "EXYNOS4412";
37 38
38static struct cpu_table cpu_ids[] __initdata = { 39static struct cpu_table cpu_ids[] __initdata = {
39 { 40 {
@@ -84,6 +85,14 @@ static struct cpu_table cpu_ids[] __initdata = {
84 .init_uarts = exynos4_init_uarts, 85 .init_uarts = exynos4_init_uarts,
85 .init = exynos4_init, 86 .init = exynos4_init,
86 .name = name_exynos4212, 87 .name = name_exynos4212,
88 }, {
89 .idcode = EXYNOS4412_CPU_ID,
90 .idmask = EXYNOS4_CPU_MASK,
91 .map_io = exynos4_map_io,
92 .init_clocks = exynos4_init_clocks,
93 .init_uarts = exynos4_init_uarts,
94 .init = exynos4_init,
95 .name = name_exynos4412,
87 }, 96 },
88}; 97};
89 98