lkml.org 
[lkml]   [2015]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 04/65] ASoC: wm8737: Fixup setting VMID Impedance control register
    Date
    From: Axel Lin <axel.lin@ingics.com>

    3.4.110-rc1 review patch. If anyone has any objections, please let me know.

    ------------------


    commit 14ba3ec1de043260cecd9e828ea2e3a0ad302893 upstream.

    According to the datasheet:
    R10 (0Ah) VMID Impedance Control

    BIT 3:2 VMIDSEL DEFAULT 00

    DESCRIPTION: VMID impedance selection control
    00: 75kΩ output
    01: 300kΩ output
    10: 2.5kΩ output

    WM8737_VMIDSEL_MASK is 0xC (VMIDSEL - [3:2]),
    so it needs to left shift WM8737_VMIDSEL_SHIFT bits for setting these bits.

    Signed-off-by: Axel Lin <axel.lin@ingics.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    sound/soc/codecs/wm8737.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c
    index 4fe9d19..80460d2 100644
    --- a/sound/soc/codecs/wm8737.c
    +++ b/sound/soc/codecs/wm8737.c
    @@ -484,7 +484,8 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,

    /* Fast VMID ramp at 2*2.5k */
    snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,
    - WM8737_VMIDSEL_MASK, 0x4);
    + WM8737_VMIDSEL_MASK,
    + 2 << WM8737_VMIDSEL_SHIFT);

    /* Bring VMID up */
    snd_soc_update_bits(codec, WM8737_POWER_MANAGEMENT,
    @@ -498,7 +499,8 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,

    /* VMID at 2*300k */
    snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,
    - WM8737_VMIDSEL_MASK, 2);
    + WM8737_VMIDSEL_MASK,
    + 1 << WM8737_VMIDSEL_SHIFT);

    break;

    --
    1.9.1


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