Merge branch 'next/dt-exynos4x12' into next/dt-samsung

[can-eth-gw-linux.git] / arch / arm / mach-exynos / mach-exynos4-dt.c

diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index 0276ae44777a8b7e4762a38d65cd9cc50a138b2a..8858068d2b6a5f2dce07ab604d6aa10f1190d4ac 100644 (file)
--- 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,