diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-23 03:18:15 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-23 03:18:15 +0400 |
| commit | 5f534d10d223636b3cd214376471fcfef71baea2 (patch) | |
| tree | 38c14b78e01e7270ccce6d6144d124a7129ca707 /drivers | |
| parent | 036c37c5809585495661d0eb6e78e0a3612ccde3 (diff) | |
| parent | fc2cac41ebbfb16da8b036cba6ec6714ab780a6d (diff) | |
| download | linux-5f534d10d223636b3cd214376471fcfef71baea2.tar.xz | |
Merge branch 'v3.17-next/cpuidle-exynos' into v3.17-next/power-exynos
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpuidle/Kconfig.arm | 2 | ||||
| -rw-r--r-- | drivers/cpuidle/cpuidle-big_little.c | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index b6d69e899f5d..2f6b33ea6e08 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm @@ -9,7 +9,7 @@ config ARM_ARMADA_370_XP_CPUIDLE config ARM_BIG_LITTLE_CPUIDLE bool "Support for ARM big.LITTLE processors" - depends on ARCH_VEXPRESS_TC2_PM + depends on ARCH_VEXPRESS_TC2_PM || ARCH_EXYNOS select ARM_CPU_SUSPEND select CPU_IDLE_MULTIPLE_DRIVERS help diff --git a/drivers/cpuidle/cpuidle-big_little.c b/drivers/cpuidle/cpuidle-big_little.c index b45fc6249041..344d79fa3407 100644 --- a/drivers/cpuidle/cpuidle-big_little.c +++ b/drivers/cpuidle/cpuidle-big_little.c @@ -163,14 +163,24 @@ static int __init bl_idle_driver_init(struct cpuidle_driver *drv, int cpu_id) return 0; } +static const struct of_device_id compatible_machine_match[] = { + { .compatible = "arm,vexpress,v2p-ca15_a7" }, + { .compatible = "samsung,exynos5420" }, + {}, +}; + static int __init bl_idle_init(void) { int ret; + struct device_node *root = of_find_node_by_path("/"); + + if (!root) + return -ENODEV; /* * Initialize the driver just for a compliant set of machines */ - if (!of_machine_is_compatible("arm,vexpress,v2p-ca15_a7")) + if (!of_match_node(compatible_machine_match, root)) return -ENODEV; /* * For now the differentiation between little and big cores |