ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for for slave mode

[pandora-kernel.git] / sound / soc / codecs / wm8990.c

diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 48e9dd9..d29a962 100644 (file)
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -47,10 +47,6 @@ static int wm8990_volatile_register(struct snd_soc_codec *codec,
        }
 }
 
-/*
- * wm8990 register cache.  Note that register 0 is not included in the
- * cache.
- */
 static const u16 wm8990_reg[] = {
        0x8990,     /* R0  - Reset */
        0x0000,     /* R1  - Power Management (1) */
@@ -405,7 +401,7 @@ static int inmixer_event(struct snd_soc_dapm_widget *w,
                (1 << WM8990_AINRMUX_PWR_BIT))) {
                reg |= WM8990_AINR_ENA;
        } else {
-               reg &= ~WM8990_AINL_ENA;
+               reg &= ~WM8990_AINR_ENA;
        }
        snd_soc_write(w->codec, WM8990_POWER_MANAGEMENT_2, reg);
 
@@ -985,7 +981,6 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target,
 static int wm8990_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
                int source, unsigned int freq_in, unsigned int freq_out)
 {
-       u16 reg;
        struct snd_soc_codec *codec = codec_dai->codec;
        struct _pll_div pll_div;
 
@@ -993,13 +988,12 @@ static int wm8990_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
                pll_factors(&pll_div, freq_out * 4, freq_in);
 
                /* Turn on PLL */
-               reg = snd_soc_read(codec, WM8990_POWER_MANAGEMENT_2);
-               reg |= WM8990_PLL_ENA;
-               snd_soc_write(codec, WM8990_POWER_MANAGEMENT_2, reg);
+               snd_soc_update_bits(codec, WM8990_POWER_MANAGEMENT_2,
+                                   WM8990_PLL_ENA, WM8990_PLL_ENA);
 
                /* sysclk comes from PLL */
-               reg = snd_soc_read(codec, WM8990_CLOCKING_2);
-               snd_soc_write(codec, WM8990_CLOCKING_2, reg | WM8990_SYSCLK_SRC);
+               snd_soc_update_bits(codec, WM8990_CLOCKING_2,
+                                   WM8990_SYSCLK_SRC, WM8990_SYSCLK_SRC);
 
                /* set up N , fractional mode and pre-divisor if necessary */
                snd_soc_write(codec, WM8990_PLL1, pll_div.n | WM8990_SDM |
@@ -1007,10 +1001,9 @@ static int wm8990_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
                snd_soc_write(codec, WM8990_PLL2, (u8)(pll_div.k>>8));
                snd_soc_write(codec, WM8990_PLL3, (u8)(pll_div.k & 0xFF));
        } else {
-               /* Turn on PLL */
-               reg = snd_soc_read(codec, WM8990_POWER_MANAGEMENT_2);
-               reg &= ~WM8990_PLL_ENA;
-               snd_soc_write(codec, WM8990_POWER_MANAGEMENT_2, reg);
+               /* Turn off PLL */
+               snd_soc_update_bits(codec, WM8990_POWER_MANAGEMENT_2,
+                                   WM8990_PLL_ENA, 0);
        }
        return 0;
 }
@@ -1088,28 +1081,23 @@ static int wm8990_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
                int div_id, int div)
 {
        struct snd_soc_codec *codec = codec_dai->codec;
-       u16 reg;
 
        switch (div_id) {
        case WM8990_MCLK_DIV:
-               reg = snd_soc_read(codec, WM8990_CLOCKING_2) &
-                       ~WM8990_MCLK_DIV_MASK;
-               snd_soc_write(codec, WM8990_CLOCKING_2, reg | div);
+               snd_soc_update_bits(codec, WM8990_CLOCKING_2,
+                                   WM8990_MCLK_DIV_MASK, div);
                break;
        case WM8990_DACCLK_DIV:
-               reg = snd_soc_read(codec, WM8990_CLOCKING_2) &
-                       ~WM8990_DAC_CLKDIV_MASK;
-               snd_soc_write(codec, WM8990_CLOCKING_2, reg | div);
+               snd_soc_update_bits(codec, WM8990_CLOCKING_2,
+                                   WM8990_DAC_CLKDIV_MASK, div);
                break;
        case WM8990_ADCCLK_DIV:
-               reg = snd_soc_read(codec, WM8990_CLOCKING_2) &
-                       ~WM8990_ADC_CLKDIV_MASK;
-               snd_soc_write(codec, WM8990_CLOCKING_2, reg | div);
+               snd_soc_update_bits(codec, WM8990_CLOCKING_2,
+                                   WM8990_ADC_CLKDIV_MASK, div);
                break;
        case WM8990_BCLK_DIV:
-               reg = snd_soc_read(codec, WM8990_CLOCKING_1) &
-                       ~WM8990_BCLK_DIV_MASK;
-               snd_soc_write(codec, WM8990_CLOCKING_1, reg | div);
+               snd_soc_update_bits(codec, WM8990_CLOCKING_1,
+                                   WM8990_BCLK_DIV_MASK, div);
                break;
        default:
                return -EINVAL;
@@ -1168,7 +1156,6 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
        enum snd_soc_bias_level level)
 {
        int ret;
-       u16 val;
 
        switch (level) {
        case SND_SOC_BIAS_ON:
@@ -1176,9 +1163,8 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
 
        case SND_SOC_BIAS_PREPARE:
                /* VMID=2*50k */
-               val = snd_soc_read(codec, WM8990_POWER_MANAGEMENT_1) &
-                       ~WM8990_VMID_MODE_MASK;
-               snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, val | 0x2);
+               snd_soc_update_bits(codec, WM8990_POWER_MANAGEMENT_1,
+                                   WM8990_VMID_MODE_MASK, 0x2);
                break;
 
        case SND_SOC_BIAS_STANDBY:
@@ -1243,9 +1229,8 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
                }
 
                /* VMID=2*250k */
-               val = snd_soc_read(codec, WM8990_POWER_MANAGEMENT_1) &
-                       ~WM8990_VMID_MODE_MASK;
-               snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, val | 0x4);
+               snd_soc_update_bits(codec, WM8990_POWER_MANAGEMENT_1,
+                                   WM8990_VMID_MODE_MASK, 0x4);
                break;
 
        case SND_SOC_BIAS_OFF:
@@ -1259,8 +1244,8 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
                        WM8990_BUFIOEN);
 
                /* mute DAC */
-               val = snd_soc_read(codec, WM8990_DAC_CTRL);
-               snd_soc_write(codec, WM8990_DAC_CTRL, val | WM8990_DAC_MUTE);
+               snd_soc_update_bits(codec, WM8990_DAC_CTRL,
+                                   WM8990_DAC_MUTE, WM8990_DAC_MUTE);
 
                /* Enable any disabled outputs */
                snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03);
@@ -1348,7 +1333,6 @@ static int wm8990_resume(struct snd_soc_codec *codec)
 static int wm8990_probe(struct snd_soc_codec *codec)
 {
        int ret;
-       u16 reg;
 
        ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
        if (ret < 0) {
@@ -1361,15 +1345,14 @@ static int wm8990_probe(struct snd_soc_codec *codec)
        /* charge output caps */
        wm8990_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-       reg = snd_soc_read(codec, WM8990_AUDIO_INTERFACE_4);
-       snd_soc_write(codec, WM8990_AUDIO_INTERFACE_4, reg | WM8990_ALRCGPIO1);
+       snd_soc_update_bits(codec, WM8990_AUDIO_INTERFACE_4,
+                           WM8990_ALRCGPIO1, WM8990_ALRCGPIO1);
 
-       reg = snd_soc_read(codec, WM8990_GPIO1_GPIO2) &
-               ~WM8990_GPIO1_SEL_MASK;
-       snd_soc_write(codec, WM8990_GPIO1_GPIO2, reg | 1);
+       snd_soc_update_bits(codec, WM8990_GPIO1_GPIO2,
+                           WM8990_GPIO1_SEL_MASK, 1);
 
-       reg = snd_soc_read(codec, WM8990_POWER_MANAGEMENT_2);
-       snd_soc_write(codec, WM8990_POWER_MANAGEMENT_2, reg | WM8990_OPCLK_ENA);
+       snd_soc_update_bits(codec, WM8990_POWER_MANAGEMENT_2,
+                           WM8990_OPCLK_ENA, WM8990_OPCLK_ENA);
 
        snd_soc_write(codec, WM8990_LEFT_OUTPUT_VOLUME, 0x50 | (1<<8));
        snd_soc_write(codec, WM8990_RIGHT_OUTPUT_VOLUME, 0x50 | (1<<8));