summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sound/soc/tegra/tegra_soc_wm8753.c4
-rw-r--r--sound/soc/tegra/tegra_wired_jack.c22
2 files changed, 18 insertions, 8 deletions
diff --git a/sound/soc/tegra/tegra_soc_wm8753.c b/sound/soc/tegra/tegra_soc_wm8753.c
index c661a62c2169..a17c70f98158 100644
--- a/sound/soc/tegra/tegra_soc_wm8753.c
+++ b/sound/soc/tegra/tegra_soc_wm8753.c
@@ -410,7 +410,7 @@ void tegra_codec_shutdown(struct snd_pcm_substream *substream)
int tegra_soc_suspend_pre(struct platform_device *pdev, pm_message_t state)
{
- tegra_jack_suspend();
+ disable_irq(gpio_to_irq(wm8753_jack->gpio));
return 0;
}
@@ -436,7 +436,7 @@ int tegra_soc_resume_pre(struct platform_device *pdev)
int tegra_soc_resume_post(struct platform_device *pdev)
{
- tegra_jack_resume();
+ enable_irq(gpio_to_irq(wm8753_jack->gpio));
return 0;
}
diff --git a/sound/soc/tegra/tegra_wired_jack.c b/sound/soc/tegra/tegra_wired_jack.c
index 8c1ff4f354cd..081ec965b1e9 100644
--- a/sound/soc/tegra/tegra_wired_jack.c
+++ b/sound/soc/tegra/tegra_wired_jack.c
@@ -130,16 +130,26 @@ static int wired_switch_notify(struct notifier_block *self,
void tegra_jack_suspend(void)
{
- snd_soc_jack_free_gpios(tegra_wired_jack,
- ARRAY_SIZE(wired_jack_gpios),
- wired_jack_gpios);
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(wired_jack_gpios); i++)
+ disable_irq(gpio_to_irq(wired_jack_gpios[i].gpio));
}
void tegra_jack_resume(void)
{
- snd_soc_jack_add_gpios(tegra_wired_jack,
- ARRAY_SIZE(wired_jack_gpios),
- wired_jack_gpios);
+ int i, val;
+
+ for (i = 0; i < ARRAY_SIZE(wired_jack_gpios); i++) {
+ val = gpio_get_value(wired_jack_gpios[i].gpio);
+ val = wired_jack_gpios[i].invert ? !val : val;
+ val = val ? wired_jack_gpios[i].report : 0;
+
+ snd_soc_jack_report(tegra_wired_jack, val,
+ wired_jack_gpios[i].report);
+
+ enable_irq(gpio_to_irq(wired_jack_gpios[i].gpio));
+ }
}
static struct notifier_block wired_switch_nb = {