summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2012-03-29 11:42:05 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:01:41 +0200
commit40414757c5922848053657fe223fc4c39e21b295 (patch)
tree7acd4a85a34dbd2ade0a298b58a9f62a42e88d14
parent7aec3be3a38705f74df761d8ccaa802580024d84 (diff)
mach_ux500:config:Removed suspend flag
By disbaling the suspend we could avoid the hangs in suspend and resume. This workaround will be removed once the power management supports for all other peripheral drivers. Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com> Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
-rw-r--r--arch/arm/configs/u8500_android_defconfig3
-rw-r--r--[-rwxr-xr-x]arch/arm/configs/u8500_defconfig5
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/configs/u8500_android_defconfig b/arch/arm/configs/u8500_android_defconfig
index 3a4bcd4b252..71cb1932811 100644
--- a/arch/arm/configs/u8500_android_defconfig
+++ b/arch/arm/configs/u8500_android_defconfig
@@ -32,9 +32,6 @@ CONFIG_UX500_SOC_DB8500=y
CONFIG_MACH_HREFV60=y
CONFIG_MACH_SNOWBALL=y
CONFIG_DBX500_PRCMU_DEBUG=y
-CONFIG_UX500_SUSPEND=y
-CONFIG_UX500_SUSPEND_STANDBY=y
-CONFIG_UX500_SUSPEND_MEM=y
# CONFIG_UX500_USECASE_GOVERNOR is not set
CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
CONFIG_DB8500_MLOADER=y
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index ab8a18be30b..50ade0d1a14 100755..100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -29,11 +29,6 @@ CONFIG_MACH_U8500_SNOWBALL=y
CONFIG_MACH_UX500_DT=y
CONFIG_UX500_GPIO_KEYS=y
CONFIG_DBX500_PRCMU_DEBUG=y
-CONFIG_UX500_SUSPEND=y
-CONFIG_UX500_SUSPEND_STANDBY=y
-CONFIG_UX500_SUSPEND_MEM=y
-CONFIG_UX500_SUSPEND_DBG=y
-CONFIG_UX500_SUSPEND_DBG_WAKE_ON_UART=y
CONFIG_DB8500_MLOADER=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y