aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/devices-db8500.c
diff options
context:
space:
mode:
authorRickard Andersson <rickard.andersson@stericsson.com>2011-05-02 16:18:19 +0200
committerRobert Marklund <robert.marklund@stericsson.com>2011-10-05 12:12:04 +0200
commit703e1bff0bf5ec044bf1e41cca55f6ffafec046c (patch)
tree5fc34655a779db0dcc5ff7c1da0929a1b0a59c7c /arch/arm/mach-ux500/devices-db8500.c
parentf77ffdf6bbd50901ecfad09b594589d04415f1b8 (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/mach-ux500/devices-db8500.c')
-rw-r--r--arch/arm/mach-ux500/devices-db8500.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index c6287d71d7c..dde1cfd66fd 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -617,13 +617,13 @@ struct platform_device u8500_ske_keypad_device = {
#ifdef CONFIG_STM_TRACE
static pin_cfg_t mop500_stm_mipi34_pins[] = {
- GPIO70_STMAPE_CLK,
- GPIO71_STMAPE_DAT3,
- GPIO72_STMAPE_DAT2,
- GPIO73_STMAPE_DAT1,
- GPIO74_STMAPE_DAT0,
- GPIO75_U2_RXD,
- GPIO76_U2_TXD,
+ GPIO70_STMAPE_CLK | PIN_SLPM_USE_MUX_SETTINGS_IN_SLEEP,
+ GPIO71_STMAPE_DAT3 | PIN_SLPM_USE_MUX_SETTINGS_IN_SLEEP,
+ GPIO72_STMAPE_DAT2 | PIN_SLPM_USE_MUX_SETTINGS_IN_SLEEP,
+ GPIO73_STMAPE_DAT1 | PIN_SLPM_USE_MUX_SETTINGS_IN_SLEEP,
+ GPIO74_STMAPE_DAT0 | PIN_SLPM_USE_MUX_SETTINGS_IN_SLEEP,
+ GPIO75_U2_RXD | PIN_SLPM_USE_MUX_SETTINGS_IN_SLEEP,
+ GPIO76_U2_TXD | PIN_SLPM_USE_MUX_SETTINGS_IN_SLEEP,
};
static pin_cfg_t mop500_stm_mipi60_pins[] = {