summaryrefslogtreecommitdiff
path: root/drivers
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 /drivers
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 'drivers')
-rw-r--r--drivers/gpio/gpio-tegra.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 6840caae921d..2084295dbb9d 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -37,6 +37,9 @@
#include <mach/iomap.h>
#include <mach/legacy_irq.h>
#include <mach/pinmux.h>
+#if defined(CONFIG_MACH_TEGRANOTE7C)
+#include <linux/tegra_audio.h>
+#endif
#include "../../arch/arm/mach-tegra/pm-irq.h"
@@ -425,11 +428,17 @@ int tegra_gpio_suspend(void)
tegra_gpio_writel(bank->wake_enb[p], GPIO_INT_ENB(gpio));
}
}
-
+#if defined(CONFIG_MACH_TEGRANOTE7C)
+ /* change to sleep gpio settings */
+ if (!tegra_is_voice_call_active() &&
+ sleep_gpio && sleep_gpio_size > 0)
+ tegra_gpio_config_table(sleep_gpio, sleep_gpio_size);
+#else
/* change to sleep gpio settings */
if (sleep_gpio && sleep_gpio_size > 0)
tegra_gpio_config_table(sleep_gpio, sleep_gpio_size);
+#endif
local_irq_restore(flags);
return 0;