diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 20:00:09 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 20:00:09 +0100 |
| commit | 648fcab2b060f82dc0138529af380171a2566d94 (patch) | |
| tree | 1e34222d0f3bf463b07a6d1e4fd9c9423b975a89 /drivers/cpuidle/cpuidle-cps.c | |
| parent | Merge branches 'pm-domains', 'pm-sleep' and 'pm-tools' (diff) | |
| parent | cpuidle: add MAINTAINERS entry for ARM Exynos cpuidle driver (diff) | |
| download | linux-dev-648fcab2b060f82dc0138529af380171a2566d94.tar.xz linux-dev-648fcab2b060f82dc0138529af380171a2566d94.zip | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: add MAINTAINERS entry for ARM Exynos cpuidle driver
drivers: cpuidle: Remove cpuidle-arm64 duplicate error messages
drivers: cpuidle: Add idle-state-name description to ARM idle states
drivers: cpuidle: Add status property to ARM idle states
cpuidle: Invert CPUIDLE_FLAG_TIME_VALID logic
Diffstat (limited to 'drivers/cpuidle/cpuidle-cps.c')
| -rw-r--r-- | drivers/cpuidle/cpuidle-cps.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/cpuidle/cpuidle-cps.c b/drivers/cpuidle/cpuidle-cps.c index fc7b62720deb..1adb6980b707 100644 --- a/drivers/cpuidle/cpuidle-cps.c +++ b/drivers/cpuidle/cpuidle-cps.c @@ -79,7 +79,6 @@ static struct cpuidle_driver cps_driver = { .enter = cps_nc_enter, .exit_latency = 200, .target_residency = 450, - .flags = CPUIDLE_FLAG_TIME_VALID, .name = "nc-wait", .desc = "non-coherent MIPS wait", }, @@ -87,8 +86,7 @@ static struct cpuidle_driver cps_driver = { .enter = cps_nc_enter, .exit_latency = 300, .target_residency = 700, - .flags = CPUIDLE_FLAG_TIME_VALID | - CPUIDLE_FLAG_TIMER_STOP, + .flags = CPUIDLE_FLAG_TIMER_STOP, .name = "clock-gated", .desc = "core clock gated", }, @@ -96,8 +94,7 @@ static struct cpuidle_driver cps_driver = { .enter = cps_nc_enter, .exit_latency = 600, .target_residency = 1000, - .flags = CPUIDLE_FLAG_TIME_VALID | - CPUIDLE_FLAG_TIMER_STOP, + .flags = CPUIDLE_FLAG_TIMER_STOP, .name = "power-gated", .desc = "core power gated", }, |