]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: rt298: disable IRQ when jack is NULL
authorBard Liao <bardliao@realtek.com>
Mon, 28 Nov 2016 05:24:06 +0000 (13:24 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 29 Nov 2016 11:36:27 +0000 (11:36 +0000)
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>
sound/soc/codecs/rt298.c

index 55558643166fda708ccb781daffcc9ed40806bc2..6c4ac5b04665c482a29550c5bf1249d3784ff6cf 100644 (file)
@@ -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;