lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 058/849] ASoC: cs42l42: Ensure 0dB full scale volume is used for headsets
    Date
    From: Stefan Binding <sbinding@opensource.cirrus.com>

    [ Upstream commit aa18457c4af7a9dad1f2b150b11beae1d8ab57aa ]

    Ensure the default 0dB playback path is always used.

    The code that set FULL_SCALE_VOL based on LOAD_DET_RCSTAT was
    spurious, and resulted in a -6dB attenuation being accidentally
    inserted into the playback path.

    Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
    Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
    Link: https://lore.kernel.org/r/20211011144903.28915-1-rf@opensource.cirrus.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/cs42l42.c | 16 +++-------------
    1 file changed, 3 insertions(+), 13 deletions(-)

    diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
    index 99c022be94a68..8838b9a0de8e4 100644
    --- a/sound/soc/codecs/cs42l42.c
    +++ b/sound/soc/codecs/cs42l42.c
    @@ -901,7 +901,6 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
    struct snd_soc_component *component = dai->component;
    struct cs42l42_private *cs42l42 = snd_soc_component_get_drvdata(component);
    unsigned int regval;
    - u8 fullScaleVol;
    int ret;

    if (mute) {
    @@ -972,20 +971,11 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
    cs42l42->stream_use |= 1 << stream;

    if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
    - /* Read the headphone load */
    - regval = snd_soc_component_read(component, CS42L42_LOAD_DET_RCSTAT);
    - if (((regval & CS42L42_RLA_STAT_MASK) >> CS42L42_RLA_STAT_SHIFT) ==
    - CS42L42_RLA_STAT_15_OHM) {
    - fullScaleVol = CS42L42_HP_FULL_SCALE_VOL_MASK;
    - } else {
    - fullScaleVol = 0;
    - }
    -
    - /* Un-mute the headphone, set the full scale volume flag */
    + /* Un-mute the headphone */
    snd_soc_component_update_bits(component, CS42L42_HP_CTL,
    CS42L42_HP_ANA_AMUTE_MASK |
    - CS42L42_HP_ANA_BMUTE_MASK |
    - CS42L42_HP_FULL_SCALE_VOL_MASK, fullScaleVol);
    + CS42L42_HP_ANA_BMUTE_MASK,
    + 0);
    }
    }

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 03:11    [W:2.384 / U:0.736 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site