diff options
author | Robert Lee <rob.lee@linaro.org> | 2012-03-21 12:48:25 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-03-22 01:19:44 -0400 |
commit | 6a6ea0acc9375571a13aa8c4e105a0807e1c16a4 (patch) | |
tree | 80e787b477ca5d4c4b794cc2291425b26d23f131 /arch | |
parent | 5c48c873baf1a67b93d26770c8fe4d41f26f48af (diff) |
ARM: davinci: Fix for cpuidle consolidation changes
The recent cpuidle consolidation changes erroneously omitted one
critical line of code.
Signed-off-by: Robert Lee <rob.lee@linaro.org>
Tested-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-davinci/cpuidle.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index 93ae096c4ab2..9107691adbdb 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c | |||
@@ -55,10 +55,11 @@ static int davinci_enter_idle(struct cpuidle_device *dev, | |||
55 | #define DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN BIT(0) | 55 | #define DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN BIT(0) |
56 | 56 | ||
57 | static struct cpuidle_driver davinci_idle_driver = { | 57 | static struct cpuidle_driver davinci_idle_driver = { |
58 | .name = "cpuidle-davinci", | 58 | .name = "cpuidle-davinci", |
59 | .owner = THIS_MODULE, | 59 | .owner = THIS_MODULE, |
60 | .states[0] = ARM_CPUIDLE_WFI_STATE, | 60 | .en_core_tk_irqen = 1, |
61 | .states[1] = { | 61 | .states[0] = ARM_CPUIDLE_WFI_STATE, |
62 | .states[1] = { | ||
62 | .enter = davinci_enter_idle, | 63 | .enter = davinci_enter_idle, |
63 | .exit_latency = 10, | 64 | .exit_latency = 10, |
64 | .target_residency = 100000, | 65 | .target_residency = 100000, |