Merge branch 'v3.17-next/cpuidle-exynos' into v3.17-next/power-exynos

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 80cbbc74d2c8..2a43a1734eca 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -335,7 +335,9 @@ static void __init exynos_dt_machine_init(void)
         if (!IS_ENABLED(CONFIG_SMP))
                 exynos_sysram_init();
 
-        exynos_cpuidle_init();
+        if (!of_machine_is_compatible("samsung,exynos5420"))
+                exynos_cpuidle_init();
+
         exynos_cpufreq_init();
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);