1 files changed, 30 insertions, 14 deletions

diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index fb9c20eace3f..c2a6e4091357 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -718,11 +718,24 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)
                         RT5677_LDO1_SEL_MASK, 0x0);
                 regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG2,
                         RT5677_PWR_LDO1, RT5677_PWR_LDO1);
-                regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
-                        RT5677_MCLK_SRC_MASK, RT5677_MCLK2_SRC);
-                regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK2,
-                        RT5677_PLL2_PR_SRC_MASK | RT5677_DSP_CLK_SRC_MASK,
-                        RT5677_PLL2_PR_SRC_MCLK2 | RT5677_DSP_CLK_SRC_BYPASS);
+                switch (rt5677->type) {
+                case RT5677:
+                        regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
+                                RT5677_MCLK_SRC_MASK, RT5677_MCLK2_SRC);
+                        regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK2,
+                                RT5677_PLL2_PR_SRC_MASK |
+                                RT5677_DSP_CLK_SRC_MASK,
+                                RT5677_PLL2_PR_SRC_MCLK2 |
+                                RT5677_DSP_CLK_SRC_BYPASS);
+                        break;
+                case RT5676:
+                        regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK2,
+                                RT5677_DSP_CLK_SRC_MASK,
+                                RT5677_DSP_CLK_SRC_BYPASS);
+                        break;
+                default:
+                        break;
+                }
                 regmap_write(rt5677->regmap, RT5677_PWR_DSP2, 0x07ff);
                 regmap_write(rt5677->regmap, RT5677_PWR_DSP1, 0x07fd);
                 rt5677_set_dsp_mode(codec, true);
@@ -4500,10 +4513,10 @@ static int rt5677_suspend(struct snd_soc_codec *codec)
         if (!rt5677->dsp_vad_en) {
                 regcache_cache_only(rt5677->regmap, true);
                 regcache_mark_dirty(rt5677->regmap);
-        }
 
-        if (gpio_is_valid(rt5677->pow_ldo2))
-                gpio_set_value_cansleep(rt5677->pow_ldo2, 0);
+                if (gpio_is_valid(rt5677->pow_ldo2))
+                        gpio_set_value_cansleep(rt5677->pow_ldo2, 0);
+        }
 
         return 0;
 }
@@ -4512,12 +4525,12 @@ static int rt5677_resume(struct snd_soc_codec *codec)
 {
         struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 
-        if (gpio_is_valid(rt5677->pow_ldo2)) {
-                gpio_set_value_cansleep(rt5677->pow_ldo2, 1);
-                msleep(10);
-        }
-
         if (!rt5677->dsp_vad_en) {
+                if (gpio_is_valid(rt5677->pow_ldo2)) {
+                        gpio_set_value_cansleep(rt5677->pow_ldo2, 1);
+                        msleep(10);
+                }
+
                 regcache_cache_only(rt5677->regmap, false);
                 regcache_sync(rt5677->regmap);
         }
@@ -4733,7 +4746,8 @@ static const struct regmap_config rt5677_regmap = {
 };
 
 static const struct i2c_device_id rt5677_i2c_id[] = {
-        { "rt5677", 0 },
+        { "rt5677", RT5677 },
+        { "rt5676", RT5676 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);
@@ -4850,6 +4864,8 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,
 
         i2c_set_clientdata(i2c, rt5677);
 
+        rt5677->type = id->driver_data;
+
         if (pdata)
                 rt5677->pdata = *pdata;