diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-13 22:30:25 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-13 22:30:25 +0100 |
| commit | a01b8605cbcdb43639dac63ba185978085e693a8 (patch) | |
| tree | 9dd0a020be8fe5ea0d7177aa53eeb1ea87304ac9 | |
| parent | b176023392360f28c0c8964a10effbc9a1f36c04 (diff) | |
| parent | ce6031c89a35cffd5a5992b08377b77f49a004b9 (diff) | |
| download | blackbird-op-linux-a01b8605cbcdb43639dac63ba185978085e693a8.tar.gz blackbird-op-linux-a01b8605cbcdb43639dac63ba185978085e693a8.zip | |
Merge branch 'cpuidle/4.0-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into pm-cpuidle
Pull ARM cpuidle fixes for v4.0 from Daniel Lezcano.
* 'cpuidle/4.0-fixes' of http://git.linaro.org/people/daniel.lezcano/linux:
cpuidle: mvebu: Update cpuidle thresholds for Armada XP SOCs
cpuidle: mvebu: Fix the CPU PM notifier usage
| -rw-r--r-- | drivers/cpuidle/cpuidle-mvebu-v7.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/cpuidle/cpuidle-mvebu-v7.c b/drivers/cpuidle/cpuidle-mvebu-v7.c index 38e68618513a..980151f34707 100644 --- a/drivers/cpuidle/cpuidle-mvebu-v7.c +++ b/drivers/cpuidle/cpuidle-mvebu-v7.c @@ -37,11 +37,11 @@ static int mvebu_v7_enter_idle(struct cpuidle_device *dev, deepidle = true; ret = mvebu_v7_cpu_suspend(deepidle); + cpu_pm_exit(); + if (ret) return ret; - cpu_pm_exit(); - return index; } @@ -50,17 +50,17 @@ static struct cpuidle_driver armadaxp_idle_driver = { .states[0] = ARM_CPUIDLE_WFI_STATE, .states[1] = { .enter = mvebu_v7_enter_idle, - .exit_latency = 10, + .exit_latency = 100, .power_usage = 50, - .target_residency = 100, + .target_residency = 1000, .name = "MV CPU IDLE", .desc = "CPU power down", }, .states[2] = { .enter = mvebu_v7_enter_idle, - .exit_latency = 100, + .exit_latency = 1000, .power_usage = 5, - .target_residency = 1000, + .target_residency = 10000, .flags = MVEBU_V7_FLAG_DEEP_IDLE, .name = "MV CPU DEEP IDLE", .desc = "CPU and L2 Fabric power down", |
