summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDavid Pu <dpu@nvidia.com>2014-03-06 12:47:46 +0800
committerDanny Song <dsong@nvidia.com>2014-03-06 18:11:55 -0800
commit5d6022ba0267f1033dbb820c6727e4cac834cbef (patch)
treee91c833e2a24a0b636bf250dc44a333a28c4d15b /arch
parent30b286fbb2c256da9f7e9537d40eaa879dda9024 (diff)
ARM:TN7C:don't reconfig GPIO_PQ1 in LP1 voice call
don't need to switch modem regulator to PSM mode during voice call under LP1 state. Bug 1474572 Change-Id: Iaa00641f4699098d9ba83cd30f7ceace531ad912 Signed-off-by: David Pu <dpu@nvidia.com> Reviewed-on: http://git-master/r/378147 Reviewed-by: David Yu (Engrg-SW) <davyu@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Yong Goo Yi <yyi@nvidia.com> Reviewed-by: Danny Song <dsong@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/pinmux-t11-tables.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/pinmux-t11-tables.c b/arch/arm/mach-tegra/pinmux-t11-tables.c
index 911f8300b6e5..63f7d9206906 100644
--- a/arch/arm/mach-tegra/pinmux-t11-tables.c
+++ b/arch/arm/mach-tegra/pinmux-t11-tables.c
@@ -34,6 +34,10 @@
#include <mach/pinmux.h>
#include <mach/pinmux-t11.h>
+#if defined(CONFIG_MACH_TEGRANOTE7C)
+#include <linux/tegra_audio.h>
+#endif
+
#include "gpio-names.h"
#define PINGROUP_REG_A 0x868
@@ -395,8 +399,14 @@ static int tegra11x_pinmux_suspend(void)
tegra_soc_drive_pingroups[i].reg);
/* change to sleep pinmux settings */
+#if defined(CONFIG_MACH_TEGRANOTE7C)
+ if (!tegra_is_voice_call_active() &&
+ sleep_pinmux && sleep_pinmux_size > 0)
+ tegra_pinmux_config_table(sleep_pinmux, sleep_pinmux_size);
+#else
if (sleep_pinmux && sleep_pinmux_size > 0)
tegra_pinmux_config_table(sleep_pinmux, sleep_pinmux_size);
+#endif
return 0;
}