Commit 39909b71 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'cpuidle/3.20' of http://git.linaro.org/people/daniel.lezcano/linux into pm-cpuidle

Pull ARM cpuidle update for 3.20 from Daniel Lezcano.

* 'cpuidle/3.20' of http://git.linaro.org/people/daniel.lezcano/linux:
  drivers: cpuidle: Don't initialize big.LITTLE driver if MCPM is unavailable
parents ec6f34e5 194fe6f2
...@@ -182,6 +182,10 @@ static int __init bl_idle_init(void) ...@@ -182,6 +182,10 @@ static int __init bl_idle_init(void)
*/ */
if (!of_match_node(compatible_machine_match, root)) if (!of_match_node(compatible_machine_match, root))
return -ENODEV; return -ENODEV;
if (!mcpm_is_available())
return -EUNATCH;
/* /*
* For now the differentiation between little and big cores * For now the differentiation between little and big cores
* is based on the part number. A7 cores are considered little * is based on the part number. A7 cores are considered little
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment