aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-06-22 07:45:00 +0530
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-29 10:30:37 +0200
commite11b3ff592ce3705006dee9ccd1b24cdc13e9230 (patch)
treec8b44bcc570de882a7dd06a381b1e2ce5b178c21
parent9823ce7cca55af157e0be4afac3fe5f1a12dd3a4 (diff)
downloadlinux-2.6.38-lt-ux500-e11b3ff592ce3705006dee9ccd1b24cdc13e9230.tar.gz
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 bdfeb2fe02a..b76a91299ed 100644
--- a/arch/arm/mach-ux500/pm/Kconfig
+++ b/arch/arm/mach-ux500/pm/Kconfig
@@ -9,7 +9,7 @@ config UX500_CPUFREQ
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
@@ -18,7 +18,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.
@@ -46,7 +47,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.