diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 14:00:09 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 14:00:09 -0500 |
commit | 648fcab2b060f82dc0138529af380171a2566d94 (patch) | |
tree | 1e34222d0f3bf463b07a6d1e4fd9c9423b975a89 /arch/arm/mach-shmobile | |
parent | 389cbf36e50a62c6ea6430c576b5f31ab7ccfae6 (diff) | |
parent | 0c570c183ace73f06e42d65432bf938fbdde6524 (diff) |
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 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/pm-sh7372.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c index 7e5c2676c489..0e37da654ed5 100644 --- a/arch/arm/mach-shmobile/pm-sh7372.c +++ b/arch/arm/mach-shmobile/pm-sh7372.c | |||
@@ -423,7 +423,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = { | |||
423 | .desc = "Core Standby Mode", | 423 | .desc = "Core Standby Mode", |
424 | .exit_latency = 10, | 424 | .exit_latency = 10, |
425 | .target_residency = 20 + 10, | 425 | .target_residency = 20 + 10, |
426 | .flags = CPUIDLE_FLAG_TIME_VALID, | ||
427 | .enter = sh7372_enter_core_standby, | 426 | .enter = sh7372_enter_core_standby, |
428 | }, | 427 | }, |
429 | .states[2] = { | 428 | .states[2] = { |
@@ -431,7 +430,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = { | |||
431 | .desc = "A3SM PLL ON", | 430 | .desc = "A3SM PLL ON", |
432 | .exit_latency = 20, | 431 | .exit_latency = 20, |
433 | .target_residency = 30 + 20, | 432 | .target_residency = 30 + 20, |
434 | .flags = CPUIDLE_FLAG_TIME_VALID, | ||
435 | .enter = sh7372_enter_a3sm_pll_on, | 433 | .enter = sh7372_enter_a3sm_pll_on, |
436 | }, | 434 | }, |
437 | .states[3] = { | 435 | .states[3] = { |
@@ -439,7 +437,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = { | |||
439 | .desc = "A3SM PLL OFF", | 437 | .desc = "A3SM PLL OFF", |
440 | .exit_latency = 120, | 438 | .exit_latency = 120, |
441 | .target_residency = 30 + 120, | 439 | .target_residency = 30 + 120, |
442 | .flags = CPUIDLE_FLAG_TIME_VALID, | ||
443 | .enter = sh7372_enter_a3sm_pll_off, | 440 | .enter = sh7372_enter_a3sm_pll_off, |
444 | }, | 441 | }, |
445 | .states[4] = { | 442 | .states[4] = { |
@@ -447,7 +444,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = { | |||
447 | .desc = "A4S PLL OFF", | 444 | .desc = "A4S PLL OFF", |
448 | .exit_latency = 240, | 445 | .exit_latency = 240, |
449 | .target_residency = 30 + 240, | 446 | .target_residency = 30 + 240, |
450 | .flags = CPUIDLE_FLAG_TIME_VALID, | ||
451 | .enter = sh7372_enter_a4s, | 447 | .enter = sh7372_enter_a4s, |
452 | .disabled = true, | 448 | .disabled = true, |
453 | }, | 449 | }, |