Merge remote-tracking branches 'asoc/topic/rt5659', 'asoc/topic/rt5660', 'asoc/topic...

[cascardo/linux.git] / sound / soc / codecs / rt5659.c

diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c
index 59ddaf3..db54550 100644 (file)
--- a/sound/soc/codecs/rt5659.c
+++ b/sound/soc/codecs/rt5659.c
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
@@ -3565,7 +3566,9 @@ static int rt5659_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
 static int rt5659_set_bias_level(struct snd_soc_codec *codec,
                        enum snd_soc_bias_level level)
 {
+       struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec);
+       int ret;
 
        switch (level) {
        case SND_SOC_BIAS_PREPARE:
@@ -3582,6 +3585,17 @@ static int rt5659_set_bias_level(struct snd_soc_codec *codec,
                        RT5659_PWR_FV1 | RT5659_PWR_FV2);
                break;
 
+       case SND_SOC_BIAS_STANDBY:
+               if (dapm->bias_level == SND_SOC_BIAS_OFF) {
+                       ret = clk_prepare_enable(rt5659->mclk);
+                       if (ret) {
+                               dev_err(codec->dev,
+                                       "failed to enable MCLK: %d\n", ret);
+                               return ret;
+                       }
+               }
+               break;
+
        case SND_SOC_BIAS_OFF:
                regmap_update_bits(rt5659->regmap, RT5659_PWR_DIG_1,
                        RT5659_PWR_LDO, 0);
@@ -3591,6 +3605,7 @@ static int rt5659_set_bias_level(struct snd_soc_codec *codec,
                        RT5659_PWR_MB | RT5659_PWR_VREF2);
                regmap_update_bits(rt5659->regmap, RT5659_DIG_MISC,
                        RT5659_DIG_GATE_CTRL, 0);
+               clk_disable_unprepare(rt5659->mclk);
                break;
 
        default:
@@ -4022,6 +4037,15 @@ static int rt5659_i2c_probe(struct i2c_client *i2c,
 
        regmap_write(rt5659->regmap, RT5659_RESET, 0);
 
+       /* Check if MCLK provided */
+       rt5659->mclk = devm_clk_get(&i2c->dev, "mclk");
+       if (IS_ERR(rt5659->mclk)) {
+               if (PTR_ERR(rt5659->mclk) != -ENOENT)
+                       return PTR_ERR(rt5659->mclk);
+               /* Otherwise mark the mclk pointer to NULL */
+               rt5659->mclk = NULL;
+       }
+
        rt5659_calibrate(rt5659);
 
        /* line in diff mode*/
@@ -4165,6 +4189,9 @@ static int rt5659_i2c_probe(struct i2c_client *i2c,
                if (ret)
                        dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret);
 
+               /* Enable IRQ output for GPIO1 pin any way */
+               regmap_update_bits(rt5659->regmap, RT5659_GPIO_CTRL_1,
+                                  RT5659_GP1_PIN_MASK, RT5659_GP1_PIN_IRQ);
        }
 
        return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5659,