lkml.org 
[lkml]   [2019]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 21/95] ASoC: rt5682: fix jack type detection issue
    Date
    [ Upstream commit 675212bfb23394514b7f68ebf3954ba936281ccc ]

    The jack type detection needs the main bias power of analog.
    The modification makes sure the main bias power on/off while jack plug/unplug.

    Signed-off-by: Shuming Fan <shumingf@realtek.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/rt5682.c | 12 +++++-------
    1 file changed, 5 insertions(+), 7 deletions(-)

    diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
    index 49ff5e52db584..9331c13d2017a 100644
    --- a/sound/soc/codecs/rt5682.c
    +++ b/sound/soc/codecs/rt5682.c
    @@ -909,7 +909,8 @@ static int rt5682_headset_detect(struct snd_soc_component *component,
    if (jack_insert) {

    snd_soc_component_update_bits(component, RT5682_PWR_ANLG_1,
    - RT5682_PWR_VREF2, RT5682_PWR_VREF2);
    + RT5682_PWR_VREF2 | RT5682_PWR_MB,
    + RT5682_PWR_VREF2 | RT5682_PWR_MB);
    snd_soc_component_update_bits(component,
    RT5682_PWR_ANLG_1, RT5682_PWR_FV2, 0);
    usleep_range(15000, 20000);
    @@ -946,7 +947,7 @@ static int rt5682_headset_detect(struct snd_soc_component *component,
    snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_1,
    RT5682_TRIG_JD_MASK, RT5682_TRIG_JD_LOW);
    snd_soc_component_update_bits(component, RT5682_PWR_ANLG_1,
    - RT5682_PWR_VREF2, 0);
    + RT5682_PWR_VREF2 | RT5682_PWR_MB, 0);
    snd_soc_component_update_bits(component, RT5682_PWR_ANLG_3,
    RT5682_PWR_CBJ, 0);

    @@ -2295,16 +2296,13 @@ static int rt5682_set_bias_level(struct snd_soc_component *component,
    switch (level) {
    case SND_SOC_BIAS_PREPARE:
    regmap_update_bits(rt5682->regmap, RT5682_PWR_ANLG_1,
    - RT5682_PWR_MB | RT5682_PWR_BG,
    - RT5682_PWR_MB | RT5682_PWR_BG);
    + RT5682_PWR_BG, RT5682_PWR_BG);
    regmap_update_bits(rt5682->regmap, RT5682_PWR_DIG_1,
    RT5682_DIG_GATE_CTRL | RT5682_PWR_LDO,
    RT5682_DIG_GATE_CTRL | RT5682_PWR_LDO);
    break;

    case SND_SOC_BIAS_STANDBY:
    - regmap_update_bits(rt5682->regmap, RT5682_PWR_ANLG_1,
    - RT5682_PWR_MB, RT5682_PWR_MB);
    regmap_update_bits(rt5682->regmap, RT5682_PWR_DIG_1,
    RT5682_DIG_GATE_CTRL, RT5682_DIG_GATE_CTRL);
    break;
    @@ -2312,7 +2310,7 @@ static int rt5682_set_bias_level(struct snd_soc_component *component,
    regmap_update_bits(rt5682->regmap, RT5682_PWR_DIG_1,
    RT5682_DIG_GATE_CTRL | RT5682_PWR_LDO, 0);
    regmap_update_bits(rt5682->regmap, RT5682_PWR_ANLG_1,
    - RT5682_PWR_MB | RT5682_PWR_BG, 0);
    + RT5682_PWR_BG, 0);
    break;

    default:
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-05-09 21:02    [W:4.365 / U:0.448 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site