ASoC: wm8994: Tune debounce rates for jack detect mode
Subsystems (3)
PATCH 1/3 ASoC: wm8994: Tune debounce rates for jack detect mode
Use a slightly larger debounce when identifying accessory type and a slightly smaller one when detecting buttons in response to user feedback from large scale testing.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8994.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8994.c +4 -2
@@ -70,8 +70,8 @@ static const struct wm8958_micd_rate micdet_rates[] = {static const struct wm8958_micd_rate jackdet_rates[] = { {32768 , true,0 ,1 }, {32768 , false,0 ,1 }, - {44100 *256 , true,7 ,10 }, - {44100 *256 , false,7 ,10 }, + {44100 *256 , true,10 ,10 }, + {44100 *256 , false,7 ,8 }, };static void wm8958_micd_set_rate (struct snd_soc_codec *codec)
@@ -3481,6 +3481,8 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)if (present) {dev_dbg (codec->dev,"Jack detected\n" ); +wm8958_micd_set_rate (codec); +snd_soc_update_bits (codec,WM8958_MICBIAS2 ,WM8958_MICB2_DISCH ,0 );
Signature · 1 line
1.7.10
PATCH 2/3 ASoC: wm8994: Allow rate configuration with custom mic callback
If a driver using a custom mic detection callback has provided a table of mic detection rates via platform data then use it.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8994.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/codecs/wm8994.c +2 -1
@@ -82,7 +82,8 @@ static void wm8958_micd_set_rate(struct snd_soc_codec *codec)const struct wm8958_micd_rate *rates;int num_rates; -if (wm8994->jack_cb != wm8958_default_micdet) +if (!(wm8994->pdata && wm8994->pdata->micd_rates) && + wm8994->jack_cb != wm8958_default_micdet)return ; idle = !wm8994->jack_mic;
Signature · 1 line
1.7.10
PATCH 3/3 ASoC: wm8994: Add trace showing wm8958_micd_set_rate()
In reply to Mark BrownThis can be helpful to users when tuning their systems.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8994.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/codecs/wm8994.c +4 -0
@@ -119,6 +119,10 @@ static void wm8958_micd_set_rate(struct snd_soc_codec *codec) val = rates[best].start <<WM8958_MICD_BIAS_STARTTIME_SHIFT | rates[best].rate <<WM8958_MICD_RATE_SHIFT ; +dev_dbg (codec->dev,"MICD rate %d,%d for %dHz %s\n" , + rates[best].start, rates[best].rate, sysclk, + idle ?"idle" :"active" ); +snd_soc_update_bits (codec,WM8958_MIC_DETECT_1 ,WM8958_MICD_BIAS_STARTTIME_MASK |WM8958_MICD_RATE_MASK , val);
Signature · 1 line
1.7.10