lkml.org 
[lkml]   [2011]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 08/11] ASoC: wm8971: Convert to snd_soc_write
    From
    Date
    Convert codec->hw_write to snd_soc_write

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    sound/soc/codecs/wm8971.c | 35 +++++++++++++++++++++++------------
    1 files changed, 23 insertions(+), 12 deletions(-)

    diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
    index 08ea6f8..2265e00 100644
    --- a/sound/soc/codecs/wm8971.c
    +++ b/sound/soc/codecs/wm8971.c
    @@ -533,6 +533,26 @@ static int wm8971_mute(struct snd_soc_dai *dai, int mute)
    return 0;
    }

    +static void wm8971_sync_cache(struct snd_soc_codec *codec)
    +{
    + short i;
    + u16 *cache;
    +
    + if (!codec->cache_sync)
    + return;
    + codec->cache_only = 0;
    + codec->cache_bypass = 1;
    + /* restore cache */
    + cache = codec->reg_cache;
    + for (i = 0; i < codec->driver->reg_cache_size; i++) {
    + if (i == WM8971_RESET || cache[i] == wm8971_reg[i])
    + continue;
    + snd_soc_write(codec, i, cache[i]);
    + }
    + codec->cache_bypass = 0;
    + codec->cache_sync = 0;
    +}
    +
    static int wm8971_set_bias_level(struct snd_soc_codec *codec,
    enum snd_soc_bias_level level)
    {
    @@ -546,6 +566,9 @@ static int wm8971_set_bias_level(struct snd_soc_codec *codec,
    case SND_SOC_BIAS_PREPARE:
    break;
    case SND_SOC_BIAS_STANDBY:
    + if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
    + wm8971_sync_cache(codec);
    +
    /* mute dac and set vmid to 500k, enable VREF */
    snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x0140);
    break;
    @@ -605,20 +628,8 @@ static int wm8971_suspend(struct snd_soc_codec *codec, pm_message_t state)

    static int wm8971_resume(struct snd_soc_codec *codec)
    {
    - int i;
    - u8 data[2];
    - u16 *cache = codec->reg_cache;
    u16 reg;

    - /* Sync reg_cache with the hardware */
    - for (i = 0; i < ARRAY_SIZE(wm8971_reg); i++) {
    - if (i == WM8971_RESET)
    - continue;
    - data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
    - data[1] = cache[i] & 0x00ff;
    - codec->hw_write(codec->control_data, data, 2);
    - }
    -
    wm8971_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

    /* charge wm8971 caps */
    --
    1.7.4.1




    \
     
     \ /
      Last update: 2011-10-07 01:57    [W:0.024 / U:61.252 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site