[alsa-devel] [PATCH] ASoC: rt5640: add headset detection function
From: Bard Liao bardliao@realtek.com
Add headset detection function to rt5640 codec driver.
Signed-off-by: Bard Liao bardliao@realtek.com --- sound/soc/codecs/rt5640.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/rt5640.h | 2 ++ 2 files changed, 62 insertions(+)
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index ce585e3..657efb7 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1911,6 +1911,66 @@ static int rt5640_resume(struct snd_soc_codec *codec) #define rt5640_resume NULL #endif
+/** + * rt5640_headset_detect - Detect headset. + * @codec: SoC audio codec device. + * @jack_insert: Jack insert or not. + * + * Detect whether is headset or not when jack inserted. + * + * Returns detect status. + */ +int rt5640_headset_detect(struct snd_soc_codec *codec, int jack_insert) +{ + int jack_type; + int sclk_src = 0; + int reg63, reg64; + + if (jack_insert) { + reg63 = snd_soc_read(codec, RT5640_PWR_ANLG1); + reg64 = snd_soc_read(codec, RT5640_PWR_ANLG2); + if (SND_SOC_BIAS_OFF == codec->dapm.bias_level) { + snd_soc_write(codec, RT5640_PWR_ANLG1, 0xa814); + sclk_src = snd_soc_read(codec, RT5640_GLB_CLK) & + RT5640_SCLK_SRC_MASK; + snd_soc_update_bits(codec, RT5640_GLB_CLK, + RT5640_SCLK_SRC_MASK, + 0x2 << RT5640_SCLK_SRC_SFT); + } + snd_soc_update_bits(codec, RT5640_PWR_ANLG1, + RT5640_PWR_LDO2, RT5640_PWR_LDO2); + snd_soc_update_bits(codec, RT5640_PWR_ANLG2, + RT5640_PWR_MB1, RT5640_PWR_MB1); + snd_soc_update_bits(codec, RT5640_MICBIAS, + RT5640_MIC1_OVCD_MASK | RT5640_MIC1_OVTH_MASK | + RT5640_PWR_CLK25M_MASK | RT5640_PWR_MB_MASK, + RT5640_MIC1_OVCD_EN | RT5640_MIC1_OVTH_600UA | + RT5640_PWR_MB_PU | RT5640_PWR_CLK25M_PU); + snd_soc_update_bits(codec, RT5640_DUMMY1, 0x1, 0x1); + msleep(100); + if (snd_soc_read(codec, RT5640_IRQ_CTRL2) & 0x8) + jack_type = RT5640_HEADPHO_DET; + else + jack_type = RT5640_HEADSET_DET; + snd_soc_update_bits(codec, RT5640_IRQ_CTRL2, + RT5640_MB1_OC_CLR, 0); + if (SND_SOC_BIAS_OFF == codec->dapm.bias_level) + snd_soc_update_bits(codec, RT5640_GLB_CLK, + RT5640_SCLK_SRC_MASK, sclk_src); + snd_soc_write(codec, RT5640_PWR_ANLG1, reg63); + snd_soc_write(codec, RT5640_PWR_ANLG2, reg64); + } else { + snd_soc_update_bits(codec, RT5640_MICBIAS, + RT5640_MIC1_OVCD_MASK, + RT5640_MIC1_OVCD_DIS); + + jack_type = RT5640_NO_JACK; + } + + return jack_type; +} +EXPORT_SYMBOL_GPL(rt5640_headset_detect); + #define RT5640_STEREO_RATES SNDRV_PCM_RATE_8000_96000 #define RT5640_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8) diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h index c48286d..c3856c8 100644 --- a/sound/soc/codecs/rt5640.h +++ b/sound/soc/codecs/rt5640.h @@ -2089,4 +2089,6 @@ struct rt5640_priv { int dmic_en; };
+int rt5640_headset_detect(struct snd_soc_codec *codec, int jack_insert); + #endif
On Mon, Jul 08, 2013 at 02:33:09PM +0800, bardliao@realtek.com wrote:
From: Bard Liao bardliao@realtek.com
Add headset detection function to rt5640 codec driver.
No, use the standard soc-jack framework for reporting accessories.
-----Original Message----- From: Mark Brown [mailto:broonie@kernel.org] Sent: Monday, July 08, 2013 7:27 PM To: Bard Liao Cc: lgirdwood@gmail.com; alsa-devel@alsa-project.org; Flove; Oder Chiou; swarren@nvidia.com; swarren@wwwdotorg.org Subject: Re: [PATCH] ASoC: rt5640: add headset detection function
On Mon, Jul 08, 2013 at 02:33:09PM +0800, bardliao@realtek.com wrote:
From: Bard Liao bardliao@realtek.com
Add headset detection function to rt5640 codec driver.
No, use the standard soc-jack framework for reporting accessories.
Do you mean call snd_soc_jack_report in rt5640_headset_detect to report the jack type?
------Please consider the environment before printing this e-mail.
On Mon, Jul 08, 2013 at 09:12:06PM +0800, Bard Liao wrote:
Add headset detection function to rt5640 codec driver.
No, use the standard soc-jack framework for reporting accessories.
Do you mean call snd_soc_jack_report in rt5640_headset_detect to report the jack type?
Yes, with an appropriate way of setting up the jack. Look at how other drivers do this.
participants (3)
-
Bard Liao
-
bardliao@realtek.com
-
Mark Brown