diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-27 14:19:53 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-27 14:19:53 +0200 |
commit | 9aadfa8fd9f8d311ba3014bf76e4d8aeee515533 (patch) | |
tree | a34c6fb208a5994438efa935466e4e0b1e730551 /arch/arm/mach-davinci | |
parent | 9ec7684c976bc528c2f37bbc0045fab28d16d172 (diff) | |
parent | be100ee83a812804d1f467f45aba9809ba49b732 (diff) |
Merge branch 'cpuidle-arm' into pm-cpuidle
* cpuidle-arm:
ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle
ARM: ux500: cpuidle: Remove pointless include
ARM: ux500: cpuidle: Instantiate the driver from platform device
ARM: davinci: cpuidle: Fix target residency
cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r-- | arch/arm/mach-davinci/cpuidle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index 36aef3a7dedb..f1ac1c94ac0f 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c @@ -65,7 +65,7 @@ static struct cpuidle_driver davinci_idle_driver = { .states[1] = { .enter = davinci_enter_idle, .exit_latency = 10, - .target_residency = 100000, + .target_residency = 10000, .flags = CPUIDLE_FLAG_TIME_VALID, .name = "DDR SR", .desc = "WFI and DDR Self Refresh", |