diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-19 13:18:47 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-19 13:18:47 +0900 |
| commit | 326f3abf19360014dfae968aa3ab891d25599618 (patch) | |
| tree | a57251231cb889e4e6b0f26d023990578b7bd98e /arch/arm/mach-exynos/mach-exynos4-dt.c | |
| parent | ef405e04abd0d4bc3f7082d241517f6db3f5c06d (diff) | |
| parent | 64a574344dadbee5d01819d9d73b594d3cbe448e (diff) | |
| download | linux-326f3abf19360014dfae968aa3ab891d25599618.tar.gz linux-326f3abf19360014dfae968aa3ab891d25599618.tar.bz2 linux-326f3abf19360014dfae968aa3ab891d25599618.zip | |
Merge branch 'next/dt-exynos4x12' into next/dt-samsung
Conflicts:
arch/arm/boot/dts/exynos4210.dtsi
Diffstat (limited to 'arch/arm/mach-exynos/mach-exynos4-dt.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos4-dt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index 0276ae44777a..8858068d2b6a 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c @@ -96,11 +96,14 @@ static void __init exynos4_dt_machine_init(void) static char const *exynos4_dt_compat[] __initdata = { "samsung,exynos4210", + "samsung,exynos4212", + "samsung,exynos4412", NULL }; DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */ + .smp = smp_ops(exynos_smp_ops), .init_irq = exynos4_init_irq, .map_io = exynos4_dt_map_io, .handle_irq = gic_handle_irq, |