diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 20:00:15 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 20:00:15 +0200 |
| commit | 127d4eb97b7bebc15fd692603263e75c220e24f9 (patch) | |
| tree | 984ff729eafadf38d972c7a0253d6fc778d3e6ac /arch/arm/plat-s5p | |
| parent | e2d7fbbd7ee0daa0588e3d7f00a3c3cccb295a19 (diff) | |
| parent | 31451afd2480caf3ae15da56cf9fc3cb3fb821cb (diff) | |
| download | op-kernel-dev-127d4eb97b7bebc15fd692603263e75c220e24f9.zip op-kernel-dev-127d4eb97b7bebc15fd692603263e75c220e24f9.tar.gz | |
Merge branch 'samsung/board' into next/board
Diffstat (limited to 'arch/arm/plat-s5p')
| -rw-r--r-- | arch/arm/plat-s5p/cpu.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c index 909507b..7b0a28f 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"; static const char name_s5pv210[] = "S5PV210/S5PC110"; static const char name_exynos4210[] = "EXYNOS4210"; static const char name_exynos4212[] = "EXYNOS4212"; +static const char name_exynos4412[] = "EXYNOS4412"; static struct cpu_table cpu_ids[] __initdata = { { @@ -84,6 +85,14 @@ static struct cpu_table cpu_ids[] __initdata = { .init_uarts = exynos4_init_uarts, .init = exynos4_init, .name = name_exynos4212, + }, { + .idcode = EXYNOS4412_CPU_ID, + .idmask = EXYNOS4_CPU_MASK, + .map_io = exynos4_map_io, + .init_clocks = exynos4_init_clocks, + .init_uarts = exynos4_init_uarts, + .init = exynos4_init, + .name = name_exynos4412, }, }; |
