aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-06-22 07:45:00 +0530
committerPhilippe Langlais <philippe.langlais@linaro.org>2011-07-22 15:52:26 +0200
commit1aed0ac0c39ef62f37976bc4cdd480057c019915 (patch)
tree71ce79c1ac5d29c534f8ada0633d80fa2cdbc8c9
parent78c0175c34b46b19cf70ea5afb4a7a7a85cf0376 (diff)
u5500: allow SUSPEND_STANDBY and CPUIDLE to be enabled
ST-Ericsson Linux next: - ST-Ericsson ID: 332226 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I4ce9d796211e10483ce11fe2c8be269cae8c58d8 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25744 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/pm/Kconfig7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/pm/Kconfig b/arch/arm/mach-ux500/pm/Kconfig
index 03aeaea57a5..d070e0a669f 100644
--- a/arch/arm/mach-ux500/pm/Kconfig
+++ b/arch/arm/mach-ux500/pm/Kconfig
@@ -1,6 +1,6 @@
config U8500_CPUIDLE
tristate "CPUIdle support"
- depends on UX500_SOC_DB8500 && CPU_IDLE && !RTC_DRV_PL031 && PM
+ depends on (UX500_SOC_DB8500 || UX500_SOC_DB5500) && CPU_IDLE && !RTC_DRV_PL031 && PM
default y
select GENERIC_CLOCKEVENTS_BROADCAST
select UX500_CONTEXT
@@ -9,7 +9,8 @@ config U8500_CPUIDLE
config U8500_CPUIDLE_DEEPEST_STATE
int "Deepest sleep state"
- default 4
+ default 4 if UX500_SOC_DB8500
+ default 1 if UX500_SOC_DB5500
depends on U8500_CPUIDLE
help
Set deepest sleep state. See the cstate struct in cpuidle.c.
@@ -37,7 +38,7 @@ config UX500_SUSPEND
config UX500_SUSPEND_STANDBY
bool "Suspend Standby goes to ApSleep"
- depends on UX500_SUSPEND && UX500_SOC_DB8500
+ depends on UX500_SUSPEND
help
If yes, echo standby > /sys/power/state puts the system into ApSleep.