Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[linux-2.6-block.git] / arch / arm / mach-exynos / exynos.c

diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 2c844393cc4bf4495497c3e2cabdbb7f353014df..2013f73797ed6c24d8c6f5f5cd850b96cb1f9869 100644 (file)
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -211,6 +211,10 @@ static void __init exynos_dt_machine_init(void)
        if (!IS_ENABLED(CONFIG_SMP))
                exynos_sysram_init();
 
+#ifdef CONFIG_ARM_EXYNOS_CPUIDLE
+       if (of_machine_is_compatible("samsung,exynos4210"))
+               exynos_cpuidle.dev.platform_data = &cpuidle_coupled_exynos_data;
+#endif
        if (of_machine_is_compatible("samsung,exynos4210") ||
            of_machine_is_compatible("samsung,exynos4212") ||
            (of_machine_is_compatible("samsung,exynos4412") &&
@@ -247,6 +251,7 @@ static void __init exynos_reserve(void)
                "samsung,mfc-v5",
                "samsung,mfc-v6",
                "samsung,mfc-v7",
+               "samsung,mfc-v8",
        };
 
        for (i = 0; i < ARRAY_SIZE(mfc_mem); i++)