diff options
| author | Bard Liao <bardliao@realtek.com> | 2016-11-28 13:24:06 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-29 11:36:27 +0000 |
| commit | e3d62cb8c70ff5ff946051484b1cdb38523d8b95 (patch) | |
| tree | fe23440c3cfc66382d895fba352b1c263401d02e /sound/soc/codecs/rt298.c | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
| download | linux-stable-e3d62cb8c70ff5ff946051484b1cdb38523d8b95.tar.gz linux-stable-e3d62cb8c70ff5ff946051484b1cdb38523d8b95.tar.bz2 linux-stable-e3d62cb8c70ff5ff946051484b1cdb38523d8b95.zip | |
ASoC: rt298: disable IRQ when jack is NULL
Disable IRQ when jack is NULL in rt298_mic_detect. So machine driver
can use it in suspend/resume.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Reviewed-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/rt298.c')
| -rw-r--r-- | sound/soc/codecs/rt298.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 55558643166f..6c4ac5b04665 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -321,11 +321,31 @@ static void rt298_jack_detect_work(struct work_struct *work) int rt298_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) { struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_dapm_context *dapm; + bool hp = false; + bool mic = false; + int status = 0; + + /* If jack in NULL, disable HS jack */ + if (!jack) { + regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x0); + dapm = snd_soc_codec_get_dapm(codec); + snd_soc_dapm_disable_pin(dapm, "LDO1"); + snd_soc_dapm_sync(dapm); + return 0; + } rt298->jack = jack; + regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x2); - /* Send an initial empty report */ - snd_soc_jack_report(rt298->jack, 0, + rt298_jack_detect(rt298, &hp, &mic); + if (hp == true) + status |= SND_JACK_HEADPHONE; + + if (mic == true) + status |= SND_JACK_MICROPHONE; + + snd_soc_jack_report(rt298->jack, status, SND_JACK_MICROPHONE | SND_JACK_HEADPHONE); return 0; |