summaryrefslogtreecommitdiff
path: root/arch/arm/plat-nomadik
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2011-10-12 15:59:25 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:01:54 +0200
commit668226ab486e373feca540bac7af3aa3de4f346b (patch)
treea662a553e9400c4a4dde04f4df1a0d95d87c42aa /arch/arm/plat-nomadik
parent178603cc737ea990e96d9ec50e97a8997399c8df (diff)
arm: ux500: Configure modem STM pins correctly in sleep
Modem STM pins was not correctly configured for the sleep states ApSleep and ApDeepSleep. This is now fixed both for suspend and cpuidle. ST Ericsson ID: 323509 ST Ericsson FOSS-OUT ID: trivial ST Ericsson Linux next: - Change-Id: I48e8bd3f00e2a6320d8d41a61acee271d4c81d91 Signed-off-by: Rickard Andersson <rickard.andersson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22434 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch/arm/plat-nomadik')
-rw-r--r--arch/arm/plat-nomadik/include/plat/pincfg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/pincfg.h b/arch/arm/plat-nomadik/include/plat/pincfg.h
index 22cb97d2d8a..e1bc46b274e 100644
--- a/arch/arm/plat-nomadik/include/plat/pincfg.h
+++ b/arch/arm/plat-nomadik/include/plat/pincfg.h
@@ -67,6 +67,7 @@ typedef unsigned long pin_cfg_t;
/* These two replace the above in DB8500v2+ */
#define PIN_SLPM_WAKEUP_ENABLE (NMK_GPIO_SLPM_WAKEUP_ENABLE << PIN_SLPM_SHIFT)
#define PIN_SLPM_WAKEUP_DISABLE (NMK_GPIO_SLPM_WAKEUP_DISABLE << PIN_SLPM_SHIFT)
+#define PIN_SLPM_USE_MUX_SETTINGS_IN_SLEEP PIN_SLPM_WAKEUP_DISABLE
#define PIN_DIR_SHIFT 14
#define PIN_DIR_MASK (0x1 << PIN_DIR_SHIFT)