ASoC: wm8996: Handle failures to determine accessory polarity
Subsystems (3)
PATCH 1/3 ASoC: wm8996: Handle failures to determine accessory polarity
If we get an indeterminate impedance with both headset polarities then give up and report the accessory as a headphone rather than continually retrying.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8996.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-)
sound/soc/codecs/wm8996.c +26 -12
@@ -89,6 +89,7 @@ struct wm8996_priv {struct snd_soc_jack *jack;bool detecting;bool jack_mic; +int jack_flips;wm8996_polarity_fn polarity_cb;#ifdef CONFIG_GPIOLIB
@@ -2427,6 +2428,7 @@ int wm8996_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, wm8996->jack = jack; wm8996->detecting = true; wm8996->polarity_cb = polarity_cb; + wm8996->jack_flips =0 ;if (wm8996->polarity_cb) wm8996->polarity_cb (codec,0 );
@@ -2542,6 +2544,19 @@ static void wm8996_hpdet_start(struct snd_soc_codec *codec) WM8996_HP_POLL, WM8996_HP_POLL); } +static void wm8996_report_headphone (struct snd_soc_codec *codec) +{ +dev_dbg (codec->dev,"Headphone detected\n" ); +wm8996_hpdet_start (codec); + +/* Increase the detection rate a bit for responsiveness. */ +snd_soc_update_bits (codec,WM8996_MIC_DETECT_1 , +WM8996_MICD_RATE_MASK | +WM8996_MICD_BIAS_STARTTIME_MASK , +7 <<WM8996_MICD_RATE_SHIFT | +7 <<WM8996_MICD_BIAS_STARTTIME_SHIFT ); +} +static void wm8996_micd (struct snd_soc_codec *codec) {struct wm8996_priv *wm8996 =snd_soc_codec_get_drvdata (codec);
@@ -2561,6 +2576,7 @@ static void wm8996_micd(struct snd_soc_codec *codec)dev_dbg (codec->dev,"Jack removal detected\n" ); wm8996->jack_mic = false; wm8996->detecting = true; + wm8996->jack_flips =0 ;snd_soc_jack_report (wm8996->jack,0 ,SND_JACK_LINEOUT |SND_JACK_HEADSET |SND_JACK_BTN_0 );
@@ -2601,9 +2617,17 @@ static void wm8996_micd(struct snd_soc_codec *codec)/* If we detected a lower impedence during initial startup * then we probably have the wrong polarity, flip it. Don't * do this for the lowest impedences to speed up detection of -* plain headphones. +* plain headphones. If both polarities report a low +* impedence then give up and report headphones. */ if (wm8996->detecting && (val &0x3f0 )) { + wm8996->jack_flips++; + +if (wm8996->jack_flips >1 ) { +wm8996_report_headphone (codec); +return ; + } + reg =snd_soc_read (codec,WM8996_ACCESSORY_DETECT_MODE_2 ); reg ^=WM8996_HPOUT1FB_SRC |WM8996_MICD_SRC |WM8996_MICD_BIAS_SRC ;
@@ -2630,17 +2654,7 @@ static void wm8996_micd(struct snd_soc_codec *codec)snd_soc_jack_report (wm8996->jack,SND_JACK_BTN_0 ,SND_JACK_BTN_0 ); }else if (wm8996->detecting) { -dev_dbg (codec->dev,"Headphone detected\n" ); -wm8996_hpdet_start (codec); - -/* Increase the detection rate a bit for -* responsiveness. -*/ -snd_soc_update_bits (codec,WM8996_MIC_DETECT_1 , -WM8996_MICD_RATE_MASK | -WM8996_MICD_BIAS_STARTTIME_MASK , -7 <<WM8996_MICD_RATE_SHIFT | -7 <<WM8996_MICD_BIAS_STARTTIME_SHIFT ); +wm8996_report_headphone (codec); } } }
Signature · 1 line
1.7.9.rc1
PATCH 2/3 ASoC: wm5100: Handle failures to determine accessory polarity
If we get an indeterminate impedance with both headset polarities then give up and report the accessory as a headphone rather than continually retrying.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm5100.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-)
sound/soc/codecs/wm5100.c +25 -13
@@ -71,6 +71,7 @@ struct wm5100_priv {bool jack_detecting;bool jack_mic;int jack_mode; +int jack_flips;struct wm5100_fll fll[2 ];
@@ -2039,6 +2040,19 @@ static void wm5100_set_detect_mode(struct wm5100_priv *wm5100, int the_mode) wm5100->jack_mode); } +static void wm5100_report_headphone (struct wm5100_priv *wm5100) +{ +dev_dbg (wm5100->dev,"Headphone detected\n" ); + wm5100->jack_detecting = false; +snd_soc_jack_report (wm5100->jack,SND_JACK_HEADPHONE , +SND_JACK_HEADPHONE ); + +/* Increase the detection rate a bit for responsiveness. */ +regmap_update_bits (wm5100->regmap,WM5100_MIC_DETECT_1 , +WM5100_ACCDET_RATE_MASK , +7 <<WM5100_ACCDET_RATE_SHIFT ); +} +static void wm5100_micd_irq (struct wm5100_priv *wm5100) {unsigned int val;
@@ -2063,6 +2077,7 @@ static void wm5100_micd_irq(struct wm5100_priv *wm5100)dev_dbg (wm5100->dev,"Jack removal detected\n" ); wm5100->jack_mic = false; wm5100->jack_detecting = true; + wm5100->jack_flips =0 ;snd_soc_jack_report (wm5100->jack,0 ,SND_JACK_LINEOUT |SND_JACK_HEADSET |SND_JACK_BTN_0 );
@@ -2102,10 +2117,16 @@ static void wm5100_micd_irq(struct wm5100_priv *wm5100)/* If we detected a lower impedence during initial startup * then we probably have the wrong polarity, flip it. Don't * do this for the lowest impedences to speed up detection of -* plain headphones. +* plain headphones and give up if neither polarity looks +* sensible. */ if (wm5100->jack_detecting && (val &0x3f8 )) { -wm5100_set_detect_mode (wm5100, !wm5100->jack_mode); + wm5100->jack_flips++; + +if (wm5100->jack_flips >1 ) +wm5100_report_headphone (wm5100); +else +wm5100_set_detect_mode (wm5100, !wm5100->jack_mode);return ; }
@@ -2119,17 +2140,7 @@ static void wm5100_micd_irq(struct wm5100_priv *wm5100)snd_soc_jack_report (wm5100->jack,SND_JACK_BTN_0 ,SND_JACK_BTN_0 ); }else if (wm5100->jack_detecting) { -dev_dbg (wm5100->dev,"Headphone detected\n" ); - wm5100->jack_detecting = false; -snd_soc_jack_report (wm5100->jack,SND_JACK_HEADPHONE , -SND_JACK_HEADPHONE ); - -/* Increase the detection rate a bit for -* responsiveness. -*/ -regmap_update_bits (wm5100->regmap,WM5100_MIC_DETECT_1 , -WM5100_ACCDET_RATE_MASK , -7 <<WM5100_ACCDET_RATE_SHIFT ); +wm5100_report_headphone (wm5100); } } }
@@ -2141,6 +2152,7 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)if (jack) { wm5100->jack = jack; wm5100->jack_detecting = true; + wm5100->jack_flips =0 ;wm5100_set_detect_mode (wm5100,0 );
Signature · 1 line
1.7.9.rc1
PATCH 3/3 ASoC: wm8994: Report any low impedance accessory as a headphone
In reply to Mark BrownReport any accessory with a low impedance as a headphone, previously anything other than a short or microphone would not be reported at all. The most likely reason is a microphone with incorrect polarity.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8994.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/codecs/wm8994.c +1 -1
@@ -3089,7 +3089,7 @@ static void wm8958_default_micdet(u16 status, void *data) } -if (wm8994->mic_detecting && status &0x4 ) { +if (wm8994->mic_detecting && status &0xfc ) {dev_dbg (codec->dev,"Detected headphone\n" ); wm8994->mic_detecting = false;
Signature · 1 line
1.7.9.rc1