| Message ID | 1415170928-29408-1-git-send-email-bardliao@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bb656add19764c7a3cf28b2b330ec0a189fe4f48 |
| Headers | show |
On Wed, Nov 05, 2014 at 03:02:08PM +0800, bardliao@realtek.com wrote: > From: Bard Liao <bardliao@realtek.com> > > rt5645 codec support jack detection function. The patch will set > related registers if JD function is used. How will the jack actually be detected - I'm not seeing anything here that looks for interrupts from the chip?
> -----Original Message----- > From: Mark Brown [mailto:broonie@kernel.org] > Sent: Wednesday, November 05, 2014 10:52 PM > To: Bard Liao > Cc: lgirdwood@gmail.com; alsa-devel@alsa-project.org; lars@metafoo.de; > Flove; Oder Chiou; yang.a.fang@intel.com > Subject: Re: [PATCH] ASoC:rt5645:Add JD function support > > On Wed, Nov 05, 2014 at 03:02:08PM +0800, bardliao@realtek.com > wrote: > > From: Bard Liao <bardliao@realtek.com> > > > > rt5645 codec support jack detection function. The patch will set > > related registers if JD function is used. > > How will the jack actually be detected - I'm not seeing anything here that > looks for interrupts from the chip? We handle the jack in/out event by rt5645_irq no matter who trigger the irq. The jack detection event may generate by codec or an external circuit. And rt5645_jack_detect will report the jack type. If the jack detection event is generated by codec, we need to set something to make it happen. This patch will configure the registers if the platform is designed to use codec's JD function. > > ------Please consider the environment before printing this e-mail.
On Wed, Nov 05, 2014 at 03:02:08PM +0800, bardliao@realtek.com wrote: > From: Bard Liao <bardliao@realtek.com> > > rt5645 codec support jack detection function. The patch will set > related registers if JD function is used. Applied, thanks.
diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h index a535271..937f421 100644 --- a/include/sound/rt5645.h +++ b/include/sound/rt5645.h @@ -23,6 +23,9 @@ struct rt5645_platform_data { unsigned int hp_det_gpio; bool gpio_hp_det_active_high; + + /* true if codec's jd function is used */ + bool en_jd_func; }; #endif diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 0e92e63..1c099ee 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2205,6 +2205,13 @@ static int rt5645_probe(struct snd_soc_codec *codec) snd_soc_update_bits(codec, RT5645_CHARGE_PUMP, 0x0300, 0x0200); + /* for JD function */ + if (rt5645->pdata.en_jd_func) { + snd_soc_dapm_force_enable_pin(&codec->dapm, "JD Power"); + snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO2"); + snd_soc_dapm_sync(&codec->dapm); + } + return 0; } @@ -2438,6 +2445,19 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, } + if (rt5645->pdata.en_jd_func) { + regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL3, + RT5645_IRQ_CLK_GATE_CTRL | RT5645_MICINDET_MANU, + RT5645_IRQ_CLK_GATE_CTRL | RT5645_MICINDET_MANU); + regmap_update_bits(rt5645->regmap, RT5645_IN1_CTRL1, + RT5645_CBJ_BST1_EN, RT5645_CBJ_BST1_EN); + regmap_update_bits(rt5645->regmap, RT5645_JD_CTRL3, + RT5645_JD_CBJ_EN | RT5645_JD_CBJ_POL, + RT5645_JD_CBJ_EN | RT5645_JD_CBJ_POL); + regmap_update_bits(rt5645->regmap, RT5645_MICBIAS, + RT5645_IRQ_CLK_INT, RT5645_IRQ_CLK_INT); + } + if (rt5645->i2c->irq) { ret = request_threaded_irq(rt5645->i2c->irq, NULL, rt5645_irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index 5ec2520..82f681b 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h @@ -1348,6 +1348,8 @@ #define RT5645_PWR_CLK25M_SFT 4 #define RT5645_PWR_CLK25M_PD (0x0 << 4) #define RT5645_PWR_CLK25M_PU (0x1 << 4) +#define RT5645_IRQ_CLK_MCLK (0x0 << 3) +#define RT5645_IRQ_CLK_INT (0x1 << 3) /* VAD Control 4 (0x9d) */ #define RT5645_VAD_SEL_MASK (0x3 << 8) @@ -2116,6 +2118,9 @@ enum { #define RT5645_RXDP2_SEL_ADC (0x1 << 3) #define RT5645_RXDP2_SEL_SFT (3) +/* General Control3 (0xfc) */ +#define RT5645_IRQ_CLK_GATE_CTRL (0x1 << 11) +#define RT5645_MICINDET_MANU (0x1 << 7) /* Vendor ID (0xfd) */ #define RT5645_VER_C 0x2