1 files changed, 65 insertions, 18 deletions

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index c60ead948ea6..5f8a7c4045c2 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -70,6 +70,7 @@ struct aic3x_priv {
         unsigned int sysclk;
         int master;
         int gpio_reset;
+        int power;
 #define AIC3X_MODEL_3X 0
 #define AIC3X_MODEL_33 1
 #define AIC3X_MODEL_3007 2
@@ -1028,6 +1029,64 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
         return 0;
 }
 
+static int aic3x_init_3007(struct snd_soc_codec *codec)
+{
+        u8 tmp1, tmp2, *cache = codec->reg_cache;
+
+        /*
+         * There is no need to cache writes to undocumented page 0xD but
+         * respective page 0 register cache entries must be preserved
+         */
+        tmp1 = cache[0xD];
+        tmp2 = cache[0x8];
+        /* Class-D speaker driver init; datasheet p. 46 */
+        snd_soc_write(codec, AIC3X_PAGE_SELECT, 0x0D);
+        snd_soc_write(codec, 0xD, 0x0D);
+        snd_soc_write(codec, 0x8, 0x5C);
+        snd_soc_write(codec, 0x8, 0x5D);
+        snd_soc_write(codec, 0x8, 0x5C);
+        snd_soc_write(codec, AIC3X_PAGE_SELECT, 0x00);
+        cache[0xD] = tmp1;
+        cache[0x8] = tmp2;
+
+        return 0;
+}
+
+static int aic3x_set_power(struct snd_soc_codec *codec, int power)
+{
+        struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);
+        int i, ret;
+        u8 *cache = codec->reg_cache;
+
+        if (power) {
+                ret = regulator_bulk_enable(ARRAY_SIZE(aic3x->supplies),
+                                            aic3x->supplies);
+                if (ret)
+                        goto out;
+                aic3x->power = 1;
+                if (aic3x->gpio_reset >= 0) {
+                        udelay(1);
+                        gpio_set_value(aic3x->gpio_reset, 1);
+                }
+
+                /* Sync reg_cache with the hardware */
+                codec->cache_only = 0;
+                for (i = 0; i < ARRAY_SIZE(aic3x_reg); i++)
+                        snd_soc_write(codec, i, cache[i]);
+                if (aic3x->model == AIC3X_MODEL_3007)
+                        aic3x_init_3007(codec);
+                codec->cache_sync = 0;
+        } else {
+                aic3x->power = 0;
+                if (aic3x->gpio_reset >= 0)
+                        gpio_set_value(aic3x->gpio_reset, 0);
+                ret = regulator_bulk_disable(ARRAY_SIZE(aic3x->supplies),
+                                             aic3x->supplies);
+        }
+out:
+        return ret;
+}
+
 static int aic3x_set_bias_level(struct snd_soc_codec *codec,
                                 enum snd_soc_bias_level level)
 {
@@ -1047,6 +1106,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
                 }
                 break;
         case SND_SOC_BIAS_STANDBY:
+                if (!aic3x->power)
+                        aic3x_set_power(codec, 1);
                 if (codec->bias_level == SND_SOC_BIAS_PREPARE &&
                     aic3x->master) {
                         /* disable pll */
@@ -1056,6 +1117,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
                 }
                 break;
         case SND_SOC_BIAS_OFF:
+                if (aic3x->power)
+                        aic3x_set_power(codec, 0);
                 break;
         }
         codec->bias_level = level;
@@ -1155,17 +1218,6 @@ static int aic3x_suspend(struct snd_soc_codec *codec, pm_message_t state)
 
 static int aic3x_resume(struct snd_soc_codec *codec)
 {
-        int i;
-        u8 data[2];
-        u8 *cache = codec->reg_cache;
-
-        /* Sync reg_cache with the hardware */
-        for (i = 0; i < ARRAY_SIZE(aic3x_reg); i++) {
-                data[0] = i;
-                data[1] = cache[i];
-                codec->hw_write(codec->control_data, data, 2);
-        }
-
         aic3x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         return 0;
@@ -1247,13 +1299,7 @@ static int aic3x_init(struct snd_soc_codec *codec)
         snd_soc_write(codec, LINE2R_2_MONOLOPM_VOL, DEFAULT_VOL);
 
         if (aic3x->model == AIC3X_MODEL_3007) {
-                /* Class-D speaker driver init; datasheet p. 46 */
-                snd_soc_write(codec, AIC3X_PAGE_SELECT, 0x0D);
-                snd_soc_write(codec, 0xD, 0x0D);
-                snd_soc_write(codec, 0x8, 0x5C);
-                snd_soc_write(codec, 0x8, 0x5D);
-                snd_soc_write(codec, 0x8, 0x5C);
-                snd_soc_write(codec, AIC3X_PAGE_SELECT, 0x00);
+                aic3x_init_3007(codec);
                 snd_soc_write(codec, CLASSD_CTRL, 0);
         }
 
@@ -1299,6 +1345,7 @@ static int aic3x_probe(struct snd_soc_codec *codec)
                 dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
                 goto err_enable;
         }
+        aic3x->power = 1;
 
         if (aic3x->gpio_reset >= 0) {
                 udelay(1);