1 files changed, 86 insertions, 156 deletions

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 3c6ee61f6c95..4393394b7bc1 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -20,7 +20,6 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
 #include <sound/wm8960.h>
@@ -29,8 +28,6 @@
 
 #define AUDIO_NAME "wm8960"
 
-struct snd_soc_codec_device soc_codec_dev_wm8960;
-
 /* R25 - Power 1 */
 #define WM8960_VMID_MASK 0x180
 #define WM8960_VREF      0x40
@@ -74,8 +71,10 @@ static const u16 wm8960_reg[WM8960_CACHEREGNUM] = {
 };
 
 struct wm8960_priv {
-        u16 reg_cache[WM8960_CACHEREGNUM];
-        struct snd_soc_codec codec;
+        enum snd_soc_control_type control_type;
+        void *control_data;
+        int (*set_bias_level)(struct snd_soc_codec *,
+                              enum snd_soc_bias_level level);
         struct snd_soc_dapm_widget *lout1;
         struct snd_soc_dapm_widget *rout1;
         struct snd_soc_dapm_widget *out3;
@@ -137,7 +136,8 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
 
-        return wm8960->deemph;
+        ucontrol->value.enumerated.item[0] = wm8960->deemph;
+        return 0;
 }
 
 static int wm8960_put_deemph(struct snd_kcontrol *kcontrol,
@@ -387,27 +387,28 @@ static int wm8960_add_widgets(struct snd_soc_codec *codec)
 {
         struct wm8960_data *pdata = codec->dev->platform_data;
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct snd_soc_dapm_widget *w;
 
-        snd_soc_dapm_new_controls(codec, wm8960_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8960_dapm_widgets,
                                   ARRAY_SIZE(wm8960_dapm_widgets));
 
-        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
+        snd_soc_dapm_add_routes(dapm, audio_paths, ARRAY_SIZE(audio_paths));
 
         /* In capless mode OUT3 is used to provide VMID for the
          * headphone outputs, otherwise it is used as a mono mixer.
          */
         if (pdata && pdata->capless) {
-                snd_soc_dapm_new_controls(codec, wm8960_dapm_widgets_capless,
+                snd_soc_dapm_new_controls(dapm, wm8960_dapm_widgets_capless,
                                           ARRAY_SIZE(wm8960_dapm_widgets_capless));
 
-                snd_soc_dapm_add_routes(codec, audio_paths_capless,
+                snd_soc_dapm_add_routes(dapm, audio_paths_capless,
                                         ARRAY_SIZE(audio_paths_capless));
         } else {
-                snd_soc_dapm_new_controls(codec, wm8960_dapm_widgets_out3,
+                snd_soc_dapm_new_controls(dapm, wm8960_dapm_widgets_out3,
                                           ARRAY_SIZE(wm8960_dapm_widgets_out3));
 
-                snd_soc_dapm_add_routes(codec, audio_paths_out3,
+                snd_soc_dapm_add_routes(dapm, audio_paths_out3,
                                         ARRAY_SIZE(audio_paths_out3));
         }
 
@@ -416,7 +417,9 @@ static int wm8960_add_widgets(struct snd_soc_codec *codec)
          * list each time to find the desired power state do so now
          * and save the result.
          */
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
+        list_for_each_entry(w, &codec->card->widgets, list) {
+                if (w->dapm != &codec->dapm)
+                        continue;
                 if (strcmp(w->name, "LOUT1 PGA") == 0)
                         wm8960->lout1 = w;
                 if (strcmp(w->name, "ROUT1 PGA") == 0)
@@ -507,8 +510,7 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
                             struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_codec *codec = socdev->card->codec;
+        struct snd_soc_codec *codec = rtd->codec;
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
         u16 iface = snd_soc_read(codec, WM8960_IFACE1) & 0xfff3;
         int i;
@@ -572,7 +574,7 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Enable anti-pop features */
                         snd_soc_write(codec, WM8960_APOP1,
                                       WM8960_POBCTRL | WM8960_SOFT_ST |
@@ -610,7 +612,7 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
 
         return 0;
 }
@@ -626,7 +628,7 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
                 break;
 
         case SND_SOC_BIAS_PREPARE:
-                switch (codec->bias_level) {
+                switch (codec->dapm.bias_level) {
                 case SND_SOC_BIAS_STANDBY:
                         /* Enable anti pop mode */
                         snd_soc_update_bits(codec, WM8960_APOP1,
@@ -681,7 +683,7 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                switch (codec->bias_level) {
+                switch (codec->dapm.bias_level) {
                 case SND_SOC_BIAS_PREPARE:
                         /* Disable HP discharge */
                         snd_soc_update_bits(codec, WM8960_APOP2,
@@ -705,7 +707,7 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
 
         return 0;
 }
@@ -849,6 +851,14 @@ static int wm8960_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
         return 0;
 }
 
+static int wm8960_set_bias_level(struct snd_soc_codec *codec,
+                                 enum snd_soc_bias_level level)
+{
+        struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
+
+        return wm8960->set_bias_level(codec, level);
+}
+
 #define WM8960_RATES SNDRV_PCM_RATE_8000_48000
 
 #define WM8960_FORMATS \
@@ -863,8 +873,8 @@ static struct snd_soc_dai_ops wm8960_dai_ops = {
         .set_pll = wm8960_set_dai_pll,
 };
 
-struct snd_soc_dai wm8960_dai = {
-        .name = "WM8960",
+static struct snd_soc_dai_driver wm8960_dai = {
+        .name = "wm8960-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 1,
@@ -880,21 +890,18 @@ struct snd_soc_dai wm8960_dai = {
         .ops = &wm8960_dai_ops,
         .symmetric_rates = 1,
 };
-EXPORT_SYMBOL_GPL(wm8960_dai);
 
-static int wm8960_suspend(struct platform_device *pdev, pm_message_t state)
+static int wm8960_suspend(struct snd_soc_codec *codec, pm_message_t state)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
+        struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
 
-        codec->set_bias_level(codec, SND_SOC_BIAS_OFF);
+        wm8960->set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
-static int wm8960_resume(struct platform_device *pdev)
+static int wm8960_resume(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
+        struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
         int i;
         u8 data[2];
         u16 *cache = codec->reg_cache;
@@ -906,78 +913,19 @@ static int wm8960_resume(struct platform_device *pdev)
                 codec->hw_write(codec->control_data, data, 2);
         }
 
-        codec->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
+        wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         return 0;
 }
 
-static struct snd_soc_codec *wm8960_codec;
-
-static int wm8960_probe(struct platform_device *pdev)
-{
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec;
-        int ret = 0;
-
-        if (wm8960_codec == NULL) {
-                dev_err(&pdev->dev, "Codec device not registered\n");
-                return -ENODEV;
-        }
-
-        socdev->card->codec = wm8960_codec;
-        codec = wm8960_codec;
-
-        /* register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to create pcms: %d\n", ret);
-                goto pcm_err;
-        }
-
-        snd_soc_add_controls(codec, wm8960_snd_controls,
-                             ARRAY_SIZE(wm8960_snd_controls));
-        wm8960_add_widgets(codec);
-
-        return ret;
-
-pcm_err:
-        return ret;
-}
-
-/* power down chip */
-static int wm8960_remove(struct platform_device *pdev)
+static int wm8960_probe(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-
-        return 0;
-}
-
-struct snd_soc_codec_device soc_codec_dev_wm8960 = {
-        .probe =        wm8960_probe,
-        .remove =       wm8960_remove,
-        .suspend =      wm8960_suspend,
-        .resume =       wm8960_resume,
-};
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8960);
-
-static int wm8960_register(struct wm8960_priv *wm8960,
-                           enum snd_soc_control_type control)
-{
-        struct wm8960_data *pdata = wm8960->codec.dev->platform_data;
-        struct snd_soc_codec *codec = &wm8960->codec;
+        struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
+        struct wm8960_data *pdata = dev_get_platdata(codec->dev);
         int ret;
         u16 reg;
 
-        if (wm8960_codec) {
-                dev_err(codec->dev, "Another WM8960 is registered\n");
-                ret = -EINVAL;
-                goto err;
-        }
-
-        codec->set_bias_level = wm8960_set_bias_level_out3;
+        wm8960->set_bias_level = wm8960_set_bias_level_out3;
+        codec->control_data = wm8960->control_data;
 
         if (!pdata) {
                 dev_warn(codec->dev, "No platform data supplied\n");
@@ -988,39 +936,22 @@ static int wm8960_register(struct wm8960_priv *wm8960,
                 }
 
                 if (pdata->capless)
-                        codec->set_bias_level = wm8960_set_bias_level_capless;
+                        wm8960->set_bias_level = wm8960_set_bias_level_capless;
         }
 
-        mutex_init(&codec->mutex);
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
-
-        snd_soc_codec_set_drvdata(codec, wm8960);
-        codec->name = "WM8960";
-        codec->owner = THIS_MODULE;
-        codec->bias_level = SND_SOC_BIAS_OFF;
-        codec->dai = &wm8960_dai;
-        codec->num_dai = 1;
-        codec->reg_cache_size = WM8960_CACHEREGNUM;
-        codec->reg_cache = &wm8960->reg_cache;
-
-        memcpy(codec->reg_cache, wm8960_reg, sizeof(wm8960_reg));
-
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, control);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8960->control_type);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
-                goto err;
+                return ret;
         }
 
         ret = wm8960_reset(codec);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to issue reset\n");
-                goto err;
+                return ret;
         }
 
-        wm8960_dai.dev = codec->dev;
-
-        codec->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+        wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         /* Latch the update bits */
         reg = snd_soc_read(codec, WM8960_LINVOL);
@@ -1044,62 +975,59 @@ static int wm8960_register(struct wm8960_priv *wm8960,
         reg = snd_soc_read(codec, WM8960_ROUT2);
         snd_soc_write(codec, WM8960_ROUT2, reg | 0x100);
 
-        wm8960_codec = codec;
-
-        ret = snd_soc_register_codec(codec);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register codec: %d\n", ret);
-                goto err;
-        }
-
-        ret = snd_soc_register_dai(&wm8960_dai);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
-                goto err_codec;
-        }
+        snd_soc_add_controls(codec, wm8960_snd_controls,
+                                     ARRAY_SIZE(wm8960_snd_controls));
+        wm8960_add_widgets(codec);
 
         return 0;
-
-err_codec:
-        snd_soc_unregister_codec(codec);
-err:
-        kfree(wm8960);
-        return ret;
 }
 
-static void wm8960_unregister(struct wm8960_priv *wm8960)
+/* power down chip */
+static int wm8960_remove(struct snd_soc_codec *codec)
 {
-        wm8960->codec.set_bias_level(&wm8960->codec, SND_SOC_BIAS_OFF);
-        snd_soc_unregister_dai(&wm8960_dai);
-        snd_soc_unregister_codec(&wm8960->codec);
-        kfree(wm8960);
-        wm8960_codec = NULL;
+        struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
+
+        wm8960->set_bias_level(codec, SND_SOC_BIAS_OFF);
+        return 0;
 }
 
+static struct snd_soc_codec_driver soc_codec_dev_wm8960 = {
+        .probe =        wm8960_probe,
+        .remove =       wm8960_remove,
+        .suspend =      wm8960_suspend,
+        .resume =       wm8960_resume,
+        .set_bias_level = wm8960_set_bias_level,
+        .reg_cache_size = ARRAY_SIZE(wm8960_reg),
+        .reg_word_size = sizeof(u16),
+        .reg_cache_default = wm8960_reg,
+};
+
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
         struct wm8960_priv *wm8960;
-        struct snd_soc_codec *codec;
+        int ret;
 
         wm8960 = kzalloc(sizeof(struct wm8960_priv), GFP_KERNEL);
         if (wm8960 == NULL)
                 return -ENOMEM;
 
-        codec = &wm8960->codec;
-
         i2c_set_clientdata(i2c, wm8960);
-        codec->control_data = i2c;
-
-        codec->dev = &i2c->dev;
+        wm8960->control_type = SND_SOC_I2C;
+        wm8960->control_data = i2c;
 
-        return wm8960_register(wm8960, SND_SOC_I2C);
+        ret = snd_soc_register_codec(&i2c->dev,
+                        &soc_codec_dev_wm8960, &wm8960_dai, 1);
+        if (ret < 0)
+                kfree(wm8960);
+        return ret;
 }
 
 static __devexit int wm8960_i2c_remove(struct i2c_client *client)
 {
-        struct wm8960_priv *wm8960 = i2c_get_clientdata(client);
-        wm8960_unregister(wm8960);
+        snd_soc_unregister_codec(&client->dev);
+        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
@@ -1111,35 +1039,37 @@ MODULE_DEVICE_TABLE(i2c, wm8960_i2c_id);
 
 static struct i2c_driver wm8960_i2c_driver = {
         .driver = {
-                .name = "wm8960",
+                .name = "wm8960-codec",
                 .owner = THIS_MODULE,
         },
         .probe =    wm8960_i2c_probe,
         .remove =   __devexit_p(wm8960_i2c_remove),
         .id_table = wm8960_i2c_id,
 };
+#endif
 
 static int __init wm8960_modinit(void)
 {
-        int ret;
-
+        int ret = 0;
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         ret = i2c_add_driver(&wm8960_i2c_driver);
         if (ret != 0) {
                 printk(KERN_ERR "Failed to register WM8960 I2C driver: %d\n",
                        ret);
         }
-
+#endif
         return ret;
 }
 module_init(wm8960_modinit);
 
 static void __exit wm8960_exit(void)
 {
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8960_i2c_driver);
+#endif
 }
 module_exit(wm8960_exit);
 
-
 MODULE_DESCRIPTION("ASoC WM8960 driver");
 MODULE_AUTHOR("Liam Girdwood");
 MODULE_LICENSE("GPL");