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 07/10 v2] ASoC: wm8960: Convert to snd_soc_cache_sync
    From
    Date
    Convert to snd_soc_cache_sync for sync reg_cache with the hardware.

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    v2: Just found in v1 I put snd_soc_cache_sync() at wrong place in
    wm8960_set_bias_level_capless().

    sound/soc/codecs/wm8960.c | 38 +++++++++++++++++++++++++++-----------
    1 files changed, 27 insertions(+), 11 deletions(-)

    diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
    index 831c20f..e8262a0 100644
    --- a/sound/soc/codecs/wm8960.c
    +++ b/sound/soc/codecs/wm8960.c
    @@ -81,6 +81,17 @@ struct wm8960_priv {
    int playback_fs;
    };

    +static int wm8960_volatile_register(struct snd_soc_codec *codec,
    + unsigned int reg)
    +{
    + switch (reg) {
    + case WM8960_RESET:
    + return 1;
    + default:
    + return 0;
    + }
    +}
    +
    #define wm8960_reset(c) snd_soc_write(c, WM8960_RESET, 0)

    /* enumerated controls */
    @@ -558,6 +569,7 @@ static int wm8960_mute(struct snd_soc_dai *dai, int mute)
    static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
    enum snd_soc_bias_level level)
    {
    + int ret;
    u16 reg;

    switch (level) {
    @@ -574,6 +586,12 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,

    case SND_SOC_BIAS_STANDBY:
    if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
    + ret = snd_soc_cache_sync(codec);
    + if (ret < 0) {
    + dev_err(codec->dev, "Failed to sync cache: %d\n", ret);
    + return ret;
    + }
    +
    /* Enable anti-pop features */
    snd_soc_write(codec, WM8960_APOP1,
    WM8960_POBCTRL | WM8960_SOFT_ST |
    @@ -620,7 +638,7 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
    enum snd_soc_bias_level level)
    {
    struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
    - int reg;
    + int reg, ret;

    switch (level) {
    case SND_SOC_BIAS_ON:
    @@ -697,6 +715,13 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
    WM8960_BUFDCOPEN);
    break;

    + case SND_SOC_BIAS_OFF:
    + ret = snd_soc_cache_sync(codec);
    + if (ret < 0) {
    + dev_err(codec->dev, "Failed to sync cache: %d\n", ret);
    + return ret;
    + }
    + break;
    default:
    break;
    }
    @@ -901,16 +926,6 @@ static int wm8960_suspend(struct snd_soc_codec *codec, pm_message_t state)
    static int wm8960_resume(struct snd_soc_codec *codec)
    {
    struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
    - int i;
    - u8 data[2];
    - u16 *cache = codec->reg_cache;
    -
    - /* Sync reg_cache with the hardware */
    - for (i = 0; i < ARRAY_SIZE(wm8960_reg); i++) {
    - data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
    - data[1] = cache[i] & 0x00ff;
    - codec->hw_write(codec->control_data, data, 2);
    - }

    wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
    return 0;
    @@ -998,6 +1013,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8960 = {
    .reg_cache_size = ARRAY_SIZE(wm8960_reg),
    .reg_word_size = sizeof(u16),
    .reg_cache_default = wm8960_reg,
    + .volatile_register = wm8960_volatile_register,
    };

    #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
    --
    1.7.4.1




    \
     
     \ /
      Last update: 2011-10-06 09:27    [W:0.047 / U:1.592 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site