Merge remote-tracking branches 'asoc/topic/wm2200', 'asoc/topic/wm5100', 'asoc/topic...

diff --combined sound/soc/codecs/wm8731.c
index c6d10533e2bde5170f8ac963333b52c62782c27f,098c143f44d653d99c33f36e02edde9eca6600d8,098c143f44d653d99c33f36e02edde9eca6600d8,8df1550f74b5a52a9beff2ebebeb90b2000eaf75,098c143f44d653d99c33f36e02edde9eca6600d8,098c143f44d653d99c33f36e02edde9eca6600d8..2245b6a32f3dc52da5b5f8ddf9393cf400172a7b
--- 1/sound/soc/codecs/wm8731.c
--- 2/sound/soc/codecs/wm8731.c
--- 3/sound/soc/codecs/wm8731.c
--- 4/sound/soc/codecs/wm8731.c
--- 5/sound/soc/codecs/wm8731.c
--- 6/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@@@@@@ -25,6 -25,6 -25,6 -25,7 -25,6 -25,6 +25,7 @@@@@@@
      #include <linux/spi/spi.h>
      #include <linux/of_device.h>
      #include <linux/mutex.h>
+++ ++#include <linux/clk.h>
      #include <sound/core.h>
      #include <sound/pcm.h>
      #include <sound/pcm_params.h>
@@@@@@@ -45,6 -45,6 -45,6 -46,7 -45,6 -45,6 +46,7 @@@@@@@ static const char *wm8731_supply_names[
      /* codec private data */
      struct wm8731_priv {
        struct regmap *regmap;
+++ ++  struct clk *mclk;
        struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES];
        const struct snd_pcm_hw_constraint_list *constraints;
        unsigned int sysclk;
@@@@@@@ -125,7 -125,7 -125,7 -127,7 -125,7 -125,7 +127,7 @@@@@@@ static int wm8731_get_deemph(struct snd
        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
      
 -----  ucontrol->value.enumerated.item[0] = wm8731->deemph;
 +++++  ucontrol->value.integer.value[0] = wm8731->deemph;
      
        return 0;
      }
@@@@@@@ -135,7 -135,7 -135,7 -137,7 -135,7 -135,7 +137,7 @@@@@@@ static int wm8731_put_deemph(struct snd
      {
        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
 -----  int deemph = ucontrol->value.enumerated.item[0];
 +++++  int deemph = ucontrol->value.integer.value[0];
        int ret = 0;
      
        if (deemph > 1)
@@@@@@@ -390,6 -390,6 -390,6 -392,8 -390,6 -390,6 +392,8 @@@@@@@ static int wm8731_set_dai_sysclk(struc
        switch (clk_id) {
        case WM8731_SYSCLK_XTAL:
        case WM8731_SYSCLK_MCLK:
+++ ++          if (wm8731->mclk && clk_set_rate(wm8731->mclk, freq))
+++ ++                  return -EINVAL;
                wm8731->sysclk_type = clk_id;
                break;
        default:
@@@@@@@ -491,6 -491,6 -491,6 -495,8 -491,6 -491,6 +495,8 @@@@@@@ static int wm8731_set_bias_level(struc
      
        switch (level) {
        case SND_SOC_BIAS_ON:
+++ ++          if (wm8731->mclk)
+++ ++                  clk_prepare_enable(wm8731->mclk);
                break;
        case SND_SOC_BIAS_PREPARE:
                break;
@@@@@@@ -509,6 -509,6 -509,6 -515,8 -509,6 -509,6 +515,8 @@@@@@@
                snd_soc_write(codec, WM8731_PWR, reg | 0x0040);
                break;
        case SND_SOC_BIAS_OFF:
+++ ++          if (wm8731->mclk)
+++ ++                  clk_disable_unprepare(wm8731->mclk);
                snd_soc_write(codec, WM8731_PWR, 0xffff);
                regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies),
                                       wm8731->supplies);
@@@@@@@ -667,6 -667,6 -667,6 -675,19 -667,6 -667,6 +675,19 @@@@@@@ static int wm8731_spi_probe(struct spi_
        if (wm8731 == NULL)
                return -ENOMEM;
      
+++ ++  wm8731->mclk = devm_clk_get(&spi->dev, "mclk");
+++ ++  if (IS_ERR(wm8731->mclk)) {
+++ ++          ret = PTR_ERR(wm8731->mclk);
+++ ++          if (ret == -ENOENT) {
+++ ++                  wm8731->mclk = NULL;
+++ ++                  dev_warn(&spi->dev, "Assuming static MCLK\n");
+++ ++          } else {
+++ ++                  dev_err(&spi->dev, "Failed to get MCLK: %d\n",
+++ ++                          ret);
+++ ++                  return ret;
+++ ++          }
+++ ++  }
+++ ++
        mutex_init(&wm8731->lock);
      
        wm8731->regmap = devm_regmap_init_spi(spi, &wm8731_regmap);
@@@@@@@ -718,6 -718,6 -718,6 -739,19 -718,6 -718,6 +739,19 @@@@@@@ static int wm8731_i2c_probe(struct i2c_
        if (wm8731 == NULL)
                return -ENOMEM;
      
+++ ++  wm8731->mclk = devm_clk_get(&i2c->dev, "mclk");
+++ ++  if (IS_ERR(wm8731->mclk)) {
+++ ++          ret = PTR_ERR(wm8731->mclk);
+++ ++          if (ret == -ENOENT) {
+++ ++                  wm8731->mclk = NULL;
+++ ++                  dev_warn(&i2c->dev, "Assuming static MCLK\n");
+++ ++          } else {
+++ ++                  dev_err(&i2c->dev, "Failed to get MCLK: %d\n",
+++ ++                          ret);
+++ ++                  return ret;
+++ ++          }
+++ ++  }
+++ ++
        mutex_init(&wm8731->lock);
      
        wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);