lkml.org 
[lkml]   [2019]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 105/211] ASoC: es8316: fix headphone mixer volume table
    Date
    From: Katsuhiro Suzuki <katsuhiro@katsuster.net>

    [ Upstream commit f972d02fee2496024cfd6f59021c9d89d54922a6 ]

    This patch fix setting table of Headphone mixer volume.
    Current code uses 4 ... 7 values but these values are prohibited.

    Correct settings are the following:
    0000 -12dB
    0001 -10.5dB
    0010 -9dB
    0011 -7.5dB
    0100 -6dB
    1000 -4.5dB
    1001 -3dB
    1010 -1.5dB
    1011 0dB

    Signed-off-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
    Reviewed-by: Daniel Drake <drake@endlessm.com>
    Link: https://lore.kernel.org/r/20190826153900.25969-1-katsuhiro@katsuster.net
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/es8316.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
    index e97d12d578b00..9ebe77c3784a8 100644
    --- a/sound/soc/codecs/es8316.c
    +++ b/sound/soc/codecs/es8316.c
    @@ -46,7 +46,10 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(adc_vol_tlv, -9600, 50, 1);
    static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_max_gain_tlv, -650, 150, 0);
    static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_min_gain_tlv, -1200, 150, 0);
    static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_target_tlv, -1650, 150, 0);
    -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(hpmixer_gain_tlv, -1200, 150, 0);
    +static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv,
    + 0, 4, TLV_DB_SCALE_ITEM(-1200, 150, 0),
    + 8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0),
    +);

    static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(adc_pga_gain_tlv,
    0, 0, TLV_DB_SCALE_ITEM(-350, 0, 0),
    @@ -84,7 +87,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = {
    SOC_DOUBLE_TLV("Headphone Playback Volume", ES8316_CPHP_ICAL_VOL,
    4, 0, 3, 1, hpout_vol_tlv),
    SOC_DOUBLE_TLV("Headphone Mixer Volume", ES8316_HPMIX_VOL,
    - 0, 4, 7, 0, hpmixer_gain_tlv),
    + 0, 4, 11, 0, hpmixer_gain_tlv),

    SOC_ENUM("Playback Polarity", dacpol),
    SOC_DOUBLE_R_TLV("DAC Playback Volume", ES8316_DAC_VOLL,
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-10-03 19:20    [W:4.118 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site