1 files changed, 261 insertions, 281 deletions

diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 77620ab98756..a6e8f3f7f052 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -51,8 +51,6 @@
 
 #include "wm8753.h"
 
-#define WM8753_VERSION "0.16"
-
 static int caps_charge = 2000;
 module_param(caps_charge, int, 0);
 MODULE_PARM_DESC(caps_charge, "WM8753 cap charge time (msecs)");
@@ -60,12 +58,6 @@ MODULE_PARM_DESC(caps_charge, "WM8753 cap charge time (msecs)");
 static void wm8753_set_dai_mode(struct snd_soc_codec *codec,
         unsigned int mode);
 
-/* codec private data */
-struct wm8753_priv {
-        unsigned int sysclk;
-        unsigned int pcmclk;
-};
-
 /*
  * wm8753 register cache
  * We can't read the WM8753 register space when we
@@ -90,6 +82,14 @@ static const u16 wm8753_reg[] = {
         0x0000, 0x0000
 };
 
+/* codec private data */
+struct wm8753_priv {
+        unsigned int sysclk;
+        unsigned int pcmclk;
+        struct snd_soc_codec codec;
+        u16 reg_cache[ARRAY_SIZE(wm8753_reg)];
+};
+
 /*
  * read wm8753 register cache
  */
@@ -97,7 +97,7 @@ static inline unsigned int wm8753_read_reg_cache(struct snd_soc_codec *codec,
         unsigned int reg)
 {
         u16 *cache = codec->reg_cache;
-        if (reg < 1 || reg > (ARRAY_SIZE(wm8753_reg) + 1))
+        if (reg < 1 || reg >= (ARRAY_SIZE(wm8753_reg) + 1))
                 return -1;
         return cache[reg - 1];
 }
@@ -109,7 +109,7 @@ static inline void wm8753_write_reg_cache(struct snd_soc_codec *codec,
         unsigned int reg, unsigned int value)
 {
         u16 *cache = codec->reg_cache;
-        if (reg < 1 || reg > 0x3f)
+        if (reg < 1 || reg >= (ARRAY_SIZE(wm8753_reg) + 1))
                 return;
         cache[reg - 1] = value;
 }
@@ -339,21 +339,6 @@ SOC_ENUM("ADC Data Select", wm8753_enum[27]),
 SOC_ENUM("ROUT2 Phase", wm8753_enum[28]),
 };
 
-/* add non dapm controls */
-static int wm8753_add_controls(struct snd_soc_codec *codec)
-{
-        int err, i;
-
-        for (i = 0; i < ARRAY_SIZE(wm8753_snd_controls); i++) {
-                err = snd_ctl_add(codec->card,
-                                snd_soc_cnew(&wm8753_snd_controls[i],
-                                                codec, NULL));
-                if (err < 0)
-                        return err;
-        }
-        return 0;
-}
-
 /*
  * _DAPM_ Controls
  */
@@ -927,7 +912,7 @@ static int wm8753_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;
         struct wm8753_priv *wm8753 = codec->private_data;
         u16 voice = wm8753_read_reg_cache(codec, WM8753_PCM) & 0x01f3;
         u16 srate = wm8753_read_reg_cache(codec, WM8753_SRATE1) & 0x017f;
@@ -1161,7 +1146,7 @@ static int wm8753_i2s_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;
         struct wm8753_priv *wm8753 = codec->private_data;
         u16 srate = wm8753_read_reg_cache(codec, WM8753_SRATE1) & 0x01c0;
         u16 hifi = wm8753_read_reg_cache(codec, WM8753_HIFI) & 0x01f3;
@@ -1316,6 +1301,51 @@ static int wm8753_set_bias_level(struct snd_soc_codec *codec,
  * 3. Voice disabled - HIFI over HIFI
  * 4. Voice disabled - HIFI over HIFI, uses voice DAI LRC for capture
  */
+static struct snd_soc_dai_ops wm8753_dai_ops_hifi_mode1 = {
+        .hw_params      = wm8753_i2s_hw_params,
+        .digital_mute   = wm8753_mute,
+        .set_fmt        = wm8753_mode1h_set_dai_fmt,
+        .set_clkdiv     = wm8753_set_dai_clkdiv,
+        .set_pll        = wm8753_set_dai_pll,
+        .set_sysclk     = wm8753_set_dai_sysclk,
+};
+
+static struct snd_soc_dai_ops wm8753_dai_ops_voice_mode1 = {
+        .hw_params      = wm8753_pcm_hw_params,
+        .digital_mute   = wm8753_mute,
+        .set_fmt        = wm8753_mode1v_set_dai_fmt,
+        .set_clkdiv     = wm8753_set_dai_clkdiv,
+        .set_pll        = wm8753_set_dai_pll,
+        .set_sysclk     = wm8753_set_dai_sysclk,
+};
+
+static struct snd_soc_dai_ops wm8753_dai_ops_voice_mode2 = {
+        .hw_params      = wm8753_pcm_hw_params,
+        .digital_mute   = wm8753_mute,
+        .set_fmt        = wm8753_mode2_set_dai_fmt,
+        .set_clkdiv     = wm8753_set_dai_clkdiv,
+        .set_pll        = wm8753_set_dai_pll,
+        .set_sysclk     = wm8753_set_dai_sysclk,
+};
+
+static struct snd_soc_dai_ops wm8753_dai_ops_hifi_mode3 = {
+        .hw_params      = wm8753_i2s_hw_params,
+        .digital_mute   = wm8753_mute,
+        .set_fmt        = wm8753_mode3_4_set_dai_fmt,
+        .set_clkdiv     = wm8753_set_dai_clkdiv,
+        .set_pll        = wm8753_set_dai_pll,
+        .set_sysclk     = wm8753_set_dai_sysclk,
+};
+
+static struct snd_soc_dai_ops wm8753_dai_ops_hifi_mode4 = {
+        .hw_params      = wm8753_i2s_hw_params,
+        .digital_mute   = wm8753_mute,
+        .set_fmt        = wm8753_mode3_4_set_dai_fmt,
+        .set_clkdiv     = wm8753_set_dai_clkdiv,
+        .set_pll        = wm8753_set_dai_pll,
+        .set_sysclk     = wm8753_set_dai_sysclk,
+};
+
 static const struct snd_soc_dai wm8753_all_dai[] = {
 /* DAI HiFi mode 1 */
 {       .name = "WM8753 HiFi",
@@ -1332,14 +1362,7 @@ static const struct snd_soc_dai wm8753_all_dai[] = {
                 .channels_max = 2,
                 .rates = WM8753_RATES,
                 .formats = WM8753_FORMATS},
-        .ops = {
-                .hw_params = wm8753_i2s_hw_params,
-                .digital_mute = wm8753_mute,
-                .set_fmt = wm8753_mode1h_set_dai_fmt,
-                .set_clkdiv = wm8753_set_dai_clkdiv,
-                .set_pll = wm8753_set_dai_pll,
-                .set_sysclk = wm8753_set_dai_sysclk,
-        },
+        .ops = &wm8753_dai_ops_hifi_mode1,
 },
 /* DAI Voice mode 1 */
 {       .name = "WM8753 Voice",
@@ -1356,14 +1379,7 @@ static const struct snd_soc_dai wm8753_all_dai[] = {
                 .channels_max = 2,
                 .rates = WM8753_RATES,
                 .formats = WM8753_FORMATS,},
-        .ops = {
-                .hw_params = wm8753_pcm_hw_params,
-                .digital_mute = wm8753_mute,
-                .set_fmt = wm8753_mode1v_set_dai_fmt,
-                .set_clkdiv = wm8753_set_dai_clkdiv,
-                .set_pll = wm8753_set_dai_pll,
-                .set_sysclk = wm8753_set_dai_sysclk,
-        },
+        .ops = &wm8753_dai_ops_voice_mode1,
 },
 /* DAI HiFi mode 2 - dummy */
 {       .name = "WM8753 HiFi",
@@ -1384,14 +1400,7 @@ static const struct snd_soc_dai wm8753_all_dai[] = {
                 .channels_max = 2,
                 .rates = WM8753_RATES,
                 .formats = WM8753_FORMATS,},
-        .ops = {
-                .hw_params = wm8753_pcm_hw_params,
-                .digital_mute = wm8753_mute,
-                .set_fmt = wm8753_mode2_set_dai_fmt,
-                .set_clkdiv = wm8753_set_dai_clkdiv,
-                .set_pll = wm8753_set_dai_pll,
-                .set_sysclk = wm8753_set_dai_sysclk,
-        },
+        .ops = &wm8753_dai_ops_voice_mode2,
 },
 /* DAI HiFi mode 3 */
 {       .name = "WM8753 HiFi",
@@ -1408,14 +1417,7 @@ static const struct snd_soc_dai wm8753_all_dai[] = {
                 .channels_max = 2,
                 .rates = WM8753_RATES,
                 .formats = WM8753_FORMATS,},
-        .ops = {
-                .hw_params = wm8753_i2s_hw_params,
-                .digital_mute = wm8753_mute,
-                .set_fmt = wm8753_mode3_4_set_dai_fmt,
-                .set_clkdiv = wm8753_set_dai_clkdiv,
-                .set_pll = wm8753_set_dai_pll,
-                .set_sysclk = wm8753_set_dai_sysclk,
-        },
+        .ops = &wm8753_dai_ops_hifi_mode3,
 },
 /* DAI Voice mode 3 - dummy */
 {       .name = "WM8753 Voice",
@@ -1436,14 +1438,7 @@ static const struct snd_soc_dai wm8753_all_dai[] = {
                 .channels_max = 2,
                 .rates = WM8753_RATES,
                 .formats = WM8753_FORMATS,},
-        .ops = {
-                .hw_params = wm8753_i2s_hw_params,
-                .digital_mute = wm8753_mute,
-                .set_fmt = wm8753_mode3_4_set_dai_fmt,
-                .set_clkdiv = wm8753_set_dai_clkdiv,
-                .set_pll = wm8753_set_dai_pll,
-                .set_sysclk = wm8753_set_dai_sysclk,
-        },
+        .ops = &wm8753_dai_ops_hifi_mode4,
 },
 /* DAI Voice mode 4 - dummy */
 {       .name = "WM8753 Voice",
@@ -1466,30 +1461,35 @@ static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode)
         if (mode < 4) {
                 int playback_active, capture_active, codec_active, pop_wait;
                 void *private_data;
+                struct list_head list;
 
                 playback_active = wm8753_dai[0].playback.active;
                 capture_active = wm8753_dai[0].capture.active;
                 codec_active = wm8753_dai[0].active;
                 private_data = wm8753_dai[0].private_data;
                 pop_wait = wm8753_dai[0].pop_wait;
+                list = wm8753_dai[0].list;
                 wm8753_dai[0] = wm8753_all_dai[mode << 1];
                 wm8753_dai[0].playback.active = playback_active;
                 wm8753_dai[0].capture.active = capture_active;
                 wm8753_dai[0].active = codec_active;
                 wm8753_dai[0].private_data = private_data;
                 wm8753_dai[0].pop_wait = pop_wait;
+                wm8753_dai[0].list = list;
 
                 playback_active = wm8753_dai[1].playback.active;
                 capture_active = wm8753_dai[1].capture.active;
                 codec_active = wm8753_dai[1].active;
                 private_data = wm8753_dai[1].private_data;
                 pop_wait = wm8753_dai[1].pop_wait;
+                list = wm8753_dai[1].list;
                 wm8753_dai[1] = wm8753_all_dai[(mode << 1) + 1];
                 wm8753_dai[1].playback.active = playback_active;
                 wm8753_dai[1].capture.active = capture_active;
                 wm8753_dai[1].active = codec_active;
                 wm8753_dai[1].private_data = private_data;
                 wm8753_dai[1].pop_wait = pop_wait;
+                wm8753_dai[1].list = list;
         }
         wm8753_dai[0].codec = codec;
         wm8753_dai[1].codec = codec;
@@ -1505,7 +1505,7 @@ static void wm8753_work(struct work_struct *work)
 static int wm8753_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;
 
         /* we only need to suspend if we are a valid card */
         if (!codec->card)
@@ -1518,7 +1518,7 @@ static int wm8753_suspend(struct platform_device *pdev, pm_message_t state)
 static int wm8753_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;
@@ -1531,6 +1531,11 @@ static int wm8753_resume(struct platform_device *pdev)
         for (i = 0; i < ARRAY_SIZE(wm8753_reg); i++) {
                 if (i + 1 == WM8753_RESET)
                         continue;
+
+                /* No point in writing hardware default values back */
+                if (cache[i] == wm8753_reg[i])
+                        continue;
+
                 data[0] = ((i + 1) << 1) | ((cache[i] >> 8) & 0x0001);
                 data[1] = cache[i] & 0x00ff;
                 codec->hw_write(codec->control_data, data, 2);
@@ -1549,44 +1554,129 @@ static int wm8753_resume(struct platform_device *pdev)
         return 0;
 }
 
+static struct snd_soc_codec *wm8753_codec;
+
+static int wm8753_probe(struct platform_device *pdev)
+{
+        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
+        struct snd_soc_codec *codec;
+        int ret = 0;
+
+        if (!wm8753_codec) {
+                dev_err(&pdev->dev, "WM8753 codec not yet registered\n");
+                return -EINVAL;
+        }
+
+        socdev->card->codec = wm8753_codec;
+        codec = wm8753_codec;
+
+        wm8753_set_dai_mode(codec, 0);
+
+        /* register pcms */
+        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
+        if (ret < 0) {
+                printk(KERN_ERR "wm8753: failed to create pcms\n");
+                goto pcm_err;
+        }
+
+        snd_soc_add_controls(codec, wm8753_snd_controls,
+                             ARRAY_SIZE(wm8753_snd_controls));
+        wm8753_add_widgets(codec);
+        ret = snd_soc_init_card(socdev);
+        if (ret < 0) {
+                printk(KERN_ERR "wm8753: failed to register card\n");
+                goto card_err;
+        }
+
+        return 0;
+
+card_err:
+        snd_soc_free_pcms(socdev);
+        snd_soc_dapm_free(socdev);
+
+pcm_err:
+        return ret;
+}
+
 /*
- * initialise the WM8753 driver
- * register the mixer and dsp interfaces with the kernel
+ * This function forces any delayed work to be queued and run.
  */
-static int wm8753_init(struct snd_soc_device *socdev)
+static int run_delayed_work(struct delayed_work *dwork)
+{
+        int ret;
+
+        /* cancel any work waiting to be queued. */
+        ret = cancel_delayed_work(dwork);
+
+        /* if there was any work waiting then we run it now and
+         * wait for it's completion */
+        if (ret) {
+                schedule_delayed_work(dwork, 0);
+                flush_scheduled_work();
+        }
+        return ret;
+}
+
+/* power down chip */
+static int wm8753_remove(struct platform_device *pdev)
 {
-        struct snd_soc_codec *codec = socdev->codec;
-        int reg, ret = 0;
+        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_wm8753 = {
+        .probe =        wm8753_probe,
+        .remove =       wm8753_remove,
+        .suspend =      wm8753_suspend,
+        .resume =       wm8753_resume,
+};
+EXPORT_SYMBOL_GPL(soc_codec_dev_wm8753);
+
+static int wm8753_register(struct wm8753_priv *wm8753)
+{
+        int ret, i;
+        struct snd_soc_codec *codec = &wm8753->codec;
+        u16 reg;
+
+        if (wm8753_codec) {
+                dev_err(codec->dev, "Multiple WM8753 devices not supported\n");
+                ret = -EINVAL;
+                goto err;
+        }
+
+        mutex_init(&codec->mutex);
+        INIT_LIST_HEAD(&codec->dapm_widgets);
+        INIT_LIST_HEAD(&codec->dapm_paths);
 
         codec->name = "WM8753";
         codec->owner = THIS_MODULE;
         codec->read = wm8753_read_reg_cache;
         codec->write = wm8753_write;
+        codec->bias_level = SND_SOC_BIAS_STANDBY;
         codec->set_bias_level = wm8753_set_bias_level;
         codec->dai = wm8753_dai;
         codec->num_dai = 2;
-        codec->reg_cache_size = ARRAY_SIZE(wm8753_reg);
-        codec->reg_cache = kmemdup(wm8753_reg, sizeof(wm8753_reg), GFP_KERNEL);
-
-        if (codec->reg_cache == NULL)
-                return -ENOMEM;
-
-        wm8753_set_dai_mode(codec, 0);
+        codec->reg_cache_size = ARRAY_SIZE(wm8753->reg_cache);
+        codec->reg_cache = &wm8753->reg_cache;
+        codec->private_data = wm8753;
 
-        wm8753_reset(codec);
+        memcpy(codec->reg_cache, wm8753_reg, sizeof(codec->reg_cache));
+        INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
 
-        /* register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
+        ret = wm8753_reset(codec);
         if (ret < 0) {
-                printk(KERN_ERR "wm8753: failed to create pcms\n");
-                goto pcm_err;
+                dev_err(codec->dev, "Failed to issue reset\n");
+                goto err;
         }
 
         /* charge output caps */
         wm8753_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
-        codec->bias_level = SND_SOC_BIAS_STANDBY;
         schedule_delayed_work(&codec->delayed_work,
-                msecs_to_jiffies(caps_charge));
+                              msecs_to_jiffies(caps_charge));
 
         /* set the update bits */
         reg = wm8753_read_reg_cache(codec, WM8753_LDAC);
@@ -1610,59 +1700,70 @@ static int wm8753_init(struct snd_soc_device *socdev)
         reg = wm8753_read_reg_cache(codec, WM8753_RINVOL);
         wm8753_write(codec, WM8753_RINVOL, reg | 0x0100);
 
-        wm8753_add_controls(codec);
-        wm8753_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8753: failed to register card\n");
-                goto card_err;
+        wm8753_codec = codec;
+
+        for (i = 0; i < ARRAY_SIZE(wm8753_dai); i++)
+                wm8753_dai[i].dev = codec->dev;
+
+        ret = snd_soc_register_codec(codec);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to register codec: %d\n", ret);
+                goto err;
         }
 
-        return ret;
+        ret = snd_soc_register_dais(&wm8753_dai[0], ARRAY_SIZE(wm8753_dai));
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to register DAIs: %d\n", ret);
+                goto err_codec;
+        }
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-pcm_err:
-        kfree(codec->reg_cache);
+        return 0;
+
+err_codec:
+        run_delayed_work(&codec->delayed_work);
+        snd_soc_unregister_codec(codec);
+err:
+        kfree(wm8753);
         return ret;
 }
 
-/* If the i2c layer weren't so broken, we could pass this kind of data
-   around */
-static struct snd_soc_device *wm8753_socdev;
+static void wm8753_unregister(struct wm8753_priv *wm8753)
+{
+        wm8753_set_bias_level(&wm8753->codec, SND_SOC_BIAS_OFF);
+        run_delayed_work(&wm8753->codec.delayed_work);
+        snd_soc_unregister_dais(&wm8753_dai[0], ARRAY_SIZE(wm8753_dai));
+        snd_soc_unregister_codec(&wm8753->codec);
+        kfree(wm8753);
+        wm8753_codec = NULL;
+}
 
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 
-/*
- * WM8753 2 wire address is determined by GPIO5
- * state during powerup.
- *    low  = 0x1a
- *    high = 0x1b
- */
-
 static int wm8753_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
-        struct snd_soc_device *socdev = wm8753_socdev;
-        struct snd_soc_codec *codec = socdev->codec;
-        int ret;
+        struct snd_soc_codec *codec;
+        struct wm8753_priv *wm8753;
 
-        i2c_set_clientdata(i2c, codec);
-        codec->control_data = i2c;
+        wm8753 = kzalloc(sizeof(struct wm8753_priv), GFP_KERNEL);
+        if (wm8753 == NULL)
+                return -ENOMEM;
 
-        ret = wm8753_init(socdev);
-        if (ret < 0)
-                pr_err("failed to initialise WM8753\n");
+        codec = &wm8753->codec;
+        codec->hw_write = (hw_write_t)i2c_master_send;
+        codec->control_data = i2c;
+        i2c_set_clientdata(i2c, wm8753);
 
-        return ret;
+        codec->dev = &i2c->dev;
+
+        return wm8753_register(wm8753);
 }
 
 static int wm8753_i2c_remove(struct i2c_client *client)
 {
-        struct snd_soc_codec *codec = i2c_get_clientdata(client);
-        kfree(codec->reg_cache);
-        return 0;
+        struct wm8753_priv *wm8753 = i2c_get_clientdata(client);
+        wm8753_unregister(wm8753);
+        return 0;
 }
 
 static const struct i2c_device_id wm8753_i2c_id[] = {
@@ -1673,86 +1774,16 @@ MODULE_DEVICE_TABLE(i2c, wm8753_i2c_id);
 
 static struct i2c_driver wm8753_i2c_driver = {
         .driver = {
-                .name = "WM8753 I2C Codec",
+                .name = "wm8753",
                 .owner = THIS_MODULE,
         },
         .probe =    wm8753_i2c_probe,
         .remove =   wm8753_i2c_remove,
         .id_table = wm8753_i2c_id,
 };
-
-static int wm8753_add_i2c_device(struct platform_device *pdev,
-                                 const struct wm8753_setup_data *setup)
-{
-        struct i2c_board_info info;
-        struct i2c_adapter *adapter;
-        struct i2c_client *client;
-        int ret;
-
-        ret = i2c_add_driver(&wm8753_i2c_driver);
-        if (ret != 0) {
-                dev_err(&pdev->dev, "can't add i2c driver\n");
-                return ret;
-        }
-
-        memset(&info, 0, sizeof(struct i2c_board_info));
-        info.addr = setup->i2c_address;
-        strlcpy(info.type, "wm8753", I2C_NAME_SIZE);
-
-        adapter = i2c_get_adapter(setup->i2c_bus);
-        if (!adapter) {
-                dev_err(&pdev->dev, "can't get i2c adapter %d\n",
-                        setup->i2c_bus);
-                goto err_driver;
-        }
-
-        client = i2c_new_device(adapter, &info);
-        i2c_put_adapter(adapter);
-        if (!client) {
-                dev_err(&pdev->dev, "can't add i2c device at 0x%x\n",
-                        (unsigned int)info.addr);
-                goto err_driver;
-        }
-
-        return 0;
-
-err_driver:
-        i2c_del_driver(&wm8753_i2c_driver);
-        return -ENODEV;
-}
 #endif
 
 #if defined(CONFIG_SPI_MASTER)
-static int __devinit wm8753_spi_probe(struct spi_device *spi)
-{
-        struct snd_soc_device *socdev = wm8753_socdev;
-        struct snd_soc_codec *codec = socdev->codec;
-        int ret;
-
-        codec->control_data = spi;
-
-        ret = wm8753_init(socdev);
-        if (ret < 0)
-                dev_err(&spi->dev, "failed to initialise WM8753\n");
-
-        return ret;
-}
-
-static int __devexit wm8753_spi_remove(struct spi_device *spi)
-{
-        return 0;
-}
-
-static struct spi_driver wm8753_spi_driver = {
-        .driver = {
-                .name   = "wm8753",
-                .bus    = &spi_bus_type,
-                .owner  = THIS_MODULE,
-        },
-        .probe          = wm8753_spi_probe,
-        .remove         = __devexit_p(wm8753_spi_remove),
-};
-
 static int wm8753_spi_write(struct spi_device *spi, const char *data, int len)
 {
         struct spi_transfer t;
@@ -1776,120 +1807,69 @@ static int wm8753_spi_write(struct spi_device *spi, const char *data, int len)
 
         return len;
 }
-#endif
 
-
-static int wm8753_probe(struct platform_device *pdev)
+static int __devinit wm8753_spi_probe(struct spi_device *spi)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct wm8753_setup_data *setup;
         struct snd_soc_codec *codec;
         struct wm8753_priv *wm8753;
-        int ret = 0;
-
-        pr_info("WM8753 Audio Codec %s", WM8753_VERSION);
-
-        setup = socdev->codec_data;
-        codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
-        if (codec == NULL)
-                return -ENOMEM;
 
         wm8753 = kzalloc(sizeof(struct wm8753_priv), GFP_KERNEL);
-        if (wm8753 == NULL) {
-                kfree(codec);
+        if (wm8753 == NULL)
                 return -ENOMEM;
-        }
 
-        codec->private_data = wm8753;
-        socdev->codec = codec;
-        mutex_init(&codec->mutex);
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
-        wm8753_socdev = socdev;
-        INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
+        codec = &wm8753->codec;
+        codec->control_data = spi;
+        codec->hw_write = (hw_write_t)wm8753_spi_write;
+        codec->dev = &spi->dev;
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-        if (setup->i2c_address) {
-                codec->hw_write = (hw_write_t)i2c_master_send;
-                ret = wm8753_add_i2c_device(pdev, setup);
-        }
-#endif
-#if defined(CONFIG_SPI_MASTER)
-        if (setup->spi) {
-                codec->hw_write = (hw_write_t)wm8753_spi_write;
-                ret = spi_register_driver(&wm8753_spi_driver);
-                if (ret != 0)
-                        printk(KERN_ERR "can't add spi driver");
-        }
-#endif
+        spi->dev.driver_data = wm8753;
 
-        if (ret != 0) {
-                kfree(codec->private_data);
-                kfree(codec);
-        }
-        return ret;
+        return wm8753_register(wm8753);
 }
 
-/*
- * This function forces any delayed work to be queued and run.
- */
-static int run_delayed_work(struct delayed_work *dwork)
+static int __devexit wm8753_spi_remove(struct spi_device *spi)
 {
-        int ret;
-
-        /* cancel any work waiting to be queued. */
-        ret = cancel_delayed_work(dwork);
-
-        /* if there was any work waiting then we run it now and
-         * wait for it's completion */
-        if (ret) {
-                schedule_delayed_work(dwork, 0);
-                flush_scheduled_work();
-        }
-        return ret;
+        struct wm8753_priv *wm8753 = spi->dev.driver_data;
+        wm8753_unregister(wm8753);
+        return 0;
 }
 
-/* power down chip */
-static int wm8753_remove(struct platform_device *pdev)
-{
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+static struct spi_driver wm8753_spi_driver = {
+        .driver = {
+                .name   = "wm8753",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = wm8753_spi_probe,
+        .remove         = __devexit_p(wm8753_spi_remove),
+};
+#endif
 
-        if (codec->control_data)
-                wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        run_delayed_work(&codec->delayed_work);
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
+static int __init wm8753_modinit(void)
+{
+        int ret;
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-        i2c_unregister_device(codec->control_data);
-        i2c_del_driver(&wm8753_i2c_driver);
+        ret = i2c_add_driver(&wm8753_i2c_driver);
+        if (ret != 0)
+                pr_err("Failed to register WM8753 I2C driver: %d\n", ret);
 #endif
 #if defined(CONFIG_SPI_MASTER)
-        spi_unregister_driver(&wm8753_spi_driver);
+        ret = spi_register_driver(&wm8753_spi_driver);
+        if (ret != 0)
+                pr_err("Failed to register WM8753 SPI driver: %d\n", ret);
 #endif
-        kfree(codec->private_data);
-        kfree(codec);
-
         return 0;
 }
-
-struct snd_soc_codec_device soc_codec_dev_wm8753 = {
-        .probe =        wm8753_probe,
-        .remove =       wm8753_remove,
-        .suspend =      wm8753_suspend,
-        .resume =       wm8753_resume,
-};
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8753);
-
-static int __init wm8753_modinit(void)
-{
-        return snd_soc_register_dais(wm8753_dai, ARRAY_SIZE(wm8753_dai));
-}
 module_init(wm8753_modinit);
 
 static void __exit wm8753_exit(void)
 {
-        snd_soc_unregister_dais(wm8753_dai, ARRAY_SIZE(wm8753_dai));
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+        i2c_del_driver(&wm8753_i2c_driver);
+#endif
+#if defined(CONFIG_SPI_MASTER)
+        spi_unregister_driver(&wm8753_spi_driver);
+#endif
 }
 module_exit(wm8753_exit);