diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-23 08:18:15 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-23 08:18:15 +0900 |
| commit | 5f534d10d223636b3cd214376471fcfef71baea2 (patch) | |
| tree | 38c14b78e01e7270ccce6d6144d124a7129ca707 /arch/arm/mach-exynos/exynos.c | |
| parent | 036c37c5809585495661d0eb6e78e0a3612ccde3 (diff) | |
| parent | fc2cac41ebbfb16da8b036cba6ec6714ab780a6d (diff) | |
| download | blackbird-obmc-linux-5f534d10d223636b3cd214376471fcfef71baea2.tar.gz blackbird-obmc-linux-5f534d10d223636b3cd214376471fcfef71baea2.zip | |
Merge branch 'v3.17-next/cpuidle-exynos' into v3.17-next/power-exynos
Diffstat (limited to 'arch/arm/mach-exynos/exynos.c')
| -rw-r--r-- | arch/arm/mach-exynos/exynos.c | 4 |
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); |
