1 files changed, 21 insertions, 34 deletions

diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 40f8238df717..6a4cea09c45d 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -171,22 +171,6 @@ SOC_SINGLE("Capture Boost(+20dB)", WM8510_ADCBOOST,  8, 1, 0),
 SOC_SINGLE("Mono Playback Switch", WM8510_MONOMIX, 6, 1, 1),
 };
 
-/* add non dapm controls */
-static int wm8510_add_controls(struct snd_soc_codec *codec)
-{
-        int err, i;
-
-        for (i = 0; i < ARRAY_SIZE(wm8510_snd_controls); i++) {
-                err = snd_ctl_add(codec->card,
-                                snd_soc_cnew(&wm8510_snd_controls[i], codec,
-                                        NULL));
-                if (err < 0)
-                        return err;
-        }
-
-        return 0;
-}
-
 /* Speaker Output Mixer */
 static const struct snd_kcontrol_new wm8510_speaker_mixer_controls[] = {
 SOC_DAPM_SINGLE("Line Bypass Switch", WM8510_SPKMIX, 1, 1, 0),
@@ -352,7 +336,7 @@ static int wm8510_set_dai_pll(struct snd_soc_dai *codec_dai,
                 return 0;
         }
 
-        pll_factors(freq_out*8, freq_in);
+        pll_factors(freq_out*4, freq_in);
 
         wm8510_write(codec, WM8510_PLLN, (pll_div.pre_div << 4) | pll_div.n);
         wm8510_write(codec, WM8510_PLLK1, pll_div.k >> 18);
@@ -383,7 +367,7 @@ static int wm8510_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
                 wm8510_write(codec, WM8510_GPIO, reg | div);
                 break;
         case WM8510_MCLKDIV:
-                reg = wm8510_read_reg_cache(codec, WM8510_CLOCK) & 0x1f;
+                reg = wm8510_read_reg_cache(codec, WM8510_CLOCK) & 0x11f;
                 wm8510_write(codec, WM8510_CLOCK, reg | div);
                 break;
         case WM8510_ADCCLK:
@@ -468,7 +452,7 @@ static int wm8510_pcm_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         u16 iface = wm8510_read_reg_cache(codec, WM8510_IFACE) & 0x19f;
         u16 adn = wm8510_read_reg_cache(codec, WM8510_ADD) & 0x1f1;
 
@@ -570,6 +554,14 @@ static int wm8510_set_bias_level(struct snd_soc_codec *codec,
 #define WM8510_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
+static struct snd_soc_dai_ops wm8510_dai_ops = {
+        .hw_params      = wm8510_pcm_hw_params,
+        .digital_mute   = wm8510_mute,
+        .set_fmt        = wm8510_set_dai_fmt,
+        .set_clkdiv     = wm8510_set_dai_clkdiv,
+        .set_pll        = wm8510_set_dai_pll,
+};
+
 struct snd_soc_dai wm8510_dai = {
         .name = "WM8510 HiFi",
         .playback = {
@@ -584,20 +576,14 @@ struct snd_soc_dai wm8510_dai = {
                 .channels_max = 2,
                 .rates = WM8510_RATES,
                 .formats = WM8510_FORMATS,},
-        .ops = {
-                .hw_params = wm8510_pcm_hw_params,
-                .digital_mute = wm8510_mute,
-                .set_fmt = wm8510_set_dai_fmt,
-                .set_clkdiv = wm8510_set_dai_clkdiv,
-                .set_pll = wm8510_set_dai_pll,
-        },
+        .ops = &wm8510_dai_ops,
 };
 EXPORT_SYMBOL_GPL(wm8510_dai);
 
 static int wm8510_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
 
         wm8510_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
@@ -606,7 +592,7 @@ static int wm8510_suspend(struct platform_device *pdev, pm_message_t state)
 static int wm8510_resume(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         int i;
         u8 data[2];
         u16 *cache = codec->reg_cache;
@@ -628,7 +614,7 @@ static int wm8510_resume(struct platform_device *pdev)
  */
 static int wm8510_init(struct snd_soc_device *socdev)
 {
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         int ret = 0;
 
         codec->name = "WM8510";
@@ -656,7 +642,8 @@ static int wm8510_init(struct snd_soc_device *socdev)
         /* power on device */
         codec->bias_level = SND_SOC_BIAS_OFF;
         wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-        wm8510_add_controls(codec);
+        snd_soc_add_controls(codec, wm8510_snd_controls,
+                                ARRAY_SIZE(wm8510_snd_controls));
         wm8510_add_widgets(codec);
         ret = snd_soc_init_card(socdev);
         if (ret < 0) {
@@ -685,7 +672,7 @@ static int wm8510_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
         struct snd_soc_device *socdev = wm8510_socdev;
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         int ret;
 
         i2c_set_clientdata(i2c, codec);
@@ -766,7 +753,7 @@ err_driver:
 static int __devinit wm8510_spi_probe(struct spi_device *spi)
 {
         struct snd_soc_device *socdev = wm8510_socdev;
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         int ret;
 
         codec->control_data = spi;
@@ -832,7 +819,7 @@ static int wm8510_probe(struct platform_device *pdev)
         if (codec == NULL)
                 return -ENOMEM;
 
-        socdev->codec = codec;
+        socdev->card->codec = codec;
         mutex_init(&codec->mutex);
         INIT_LIST_HEAD(&codec->dapm_widgets);
         INIT_LIST_HEAD(&codec->dapm_paths);
@@ -862,7 +849,7 @@ static int wm8510_probe(struct platform_device *pdev)
 static int wm8510_remove(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
 
         if (codec->control_data)
                 wm8510_set_bias_level(codec, SND_SOC_BIAS_OFF);