ASoC: multi-component - ASoC Multi-Component Support

This patch extends the ASoC API to allow sound cards to have more than one
CODEC and more than one platform DMA controller. This is achieved by dividing
some current ASoC structures that contain both driver data and device data into
structures that only either contain device data or driver data. i.e.

 struct snd_soc_codec    --->  struct snd_soc_codec (device data)
                          +->  struct snd_soc_codec_driver (driver data)

 struct snd_soc_platform --->  struct snd_soc_platform (device data)
                          +->  struct snd_soc_platform_driver (driver data)

 struct snd_soc_dai      --->  struct snd_soc_dai (device data)
                          +->  struct snd_soc_dai_driver (driver data)

 struct snd_soc_device   --->  deleted

This now allows ASoC to be more tightly aligned with the Linux driver model and
also means that every ASoC codec, platform and (platform) DAI is a kernel
device. ASoC component private data is now stored as device private data.

The ASoC sound card struct snd_soc_card has also been updated to store lists
of it's components rather than a pointer to a codec and platform. The PCM
runtime struct soc_pcm_runtime now has pointers to all its components.

This patch adds DAPM support for ASoC multi-component and removes struct
snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec
or runtime PCM level basis rather than using snd_soc_socdev.

Other notable multi-component changes:-

 * Stream operations now de-reference less structures.
 * close_delayed work() now runs on a DAI basis rather than looping all DAIs
   in a card.
 * PM suspend()/resume() operations can now handle N CODECs and Platforms
   per sound card.
 * Added soc_bind_dai_link() to bind the component devices to the sound card.
 * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove
   DAI link components.
 * sysfs entries can now be registered per component per card.
 * snd_soc_new_pcms() functionailty rolled into dai_link_probe().
 * snd_soc_register_codec() now does all the codec list and mutex init.

This patch changes the probe() and remove() of the CODEC drivers as follows:-

 o Make CODEC driver a platform driver
 o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core.
 o Removed all static codec pointers (drivers now support > 1 codec dev)
 o snd_soc_register_pcms() now done by core.
 o snd_soc_register_dai() folded into snd_soc_register_codec().

CS4270 portions:
Acked-by: Timur Tabi <timur@freescale.com>

Some TLV320aic23 and Cirrus platform fixes.
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>

TI CODEC and OMAP fixes
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>

Samsung platform and misc fixes :-
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Seungwhan Youn <sw.youn@samsung.com>

MPC8610 and PPC fixes.
Signed-off-by: Timur Tabi <timur@freescale.com>

i.MX fixes and some core fixes.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

J4740 platform fixes:-
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

CC: Tony Lindgren <tony@atomide.com>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Kevin Hilman <khilman@deeprootsystems.com>
CC: Sascha Hauer <s.hauer@pengutronix.de>
CC: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
CC: Kuninori Morimoto <morimoto.kuninori@renesas.com>
CC: Daniel Gloeckner <dg@emlix.com>
CC: Manuel Lauss <mano@roarinelk.homelinux.net>
CC: Mike Frysinger <vapier.adi@gmail.com>
CC: Arnaud Patard <apatard@mandriva.com>
CC: Wan ZongShun <mcuos.com@gmail.com>

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

1 files changed, 77 insertions, 153 deletions

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index a87046a96f2a..7823f92413f3 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -36,9 +36,6 @@
 #include "wm8994.h"
 #include "wm_hubs.h"
 
-static struct snd_soc_codec *wm8994_codec;
-struct snd_soc_codec_device soc_codec_dev_wm8994;
-
 struct fll_config {
         int src;
         int in;
@@ -71,7 +68,9 @@ struct wm8994_micdet {
 /* codec private data */
 struct wm8994_priv {
         struct wm_hubs_data hubs;
-        struct snd_soc_codec codec;
+        enum snd_soc_control_type control_type;
+        void *control_data;
+        struct snd_soc_codec *codec;
         u16 reg_cache[WM8994_REG_CACHE_SIZE + 1];
         int sysclk[2];
         int sysclk_rate[2];
@@ -1901,8 +1900,6 @@ static int wm8994_put_drc_sw(struct snd_kcontrol *kcontrol,
         return snd_soc_put_volsw(kcontrol, ucontrol);
 }
 
-
-
 static void wm8994_set_drc(struct snd_soc_codec *codec, int drc)
 {
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
@@ -1941,7 +1938,7 @@ static int wm8994_put_drc_enum(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);  
+        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994_pdata *pdata = wm8994->pdata;
         int drc = wm8994_get_drc(kcontrol->id.name);
         int value = ucontrol->value.integer.value[0];
@@ -2044,7 +2041,7 @@ static int wm8994_put_retune_mobile_enum(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);  
+        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994_pdata *pdata = wm8994->pdata;
         int block = wm8994_get_retune_mobile_block(kcontrol->id.name);
         int value = ucontrol->value.integer.value[0];
@@ -2066,7 +2063,7 @@ static int wm8994_get_retune_mobile_enum(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
+        struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata(codec);
         int block = wm8994_get_retune_mobile_block(kcontrol->id.name);
 
         ucontrol->value.enumerated.item[0] = wm8994->retune_mobile_cfg[block];
@@ -2880,10 +2877,9 @@ static int wm8994_get_fll_config(struct fll_div *fll,
         return 0;
 }
 
-static int wm8994_set_fll(struct snd_soc_dai *dai, int id, int src,
+static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
                           unsigned int freq_in, unsigned int freq_out)
 {
-        struct snd_soc_codec *codec = dai->codec;
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         int reg_offset, ret;
         struct fll_div fll;
@@ -2994,8 +2990,15 @@ static int wm8994_set_fll(struct snd_soc_dai *dai, int id, int src,
         return 0;
 }
 
+
 static int opclk_divs[] = { 10, 20, 30, 40, 55, 60, 80, 120, 160 };
 
+static int wm8994_set_fll(struct snd_soc_dai *dai, int id, int src,
+                          unsigned int freq_in, unsigned int freq_out)
+{
+        return _wm8994_set_fll(dai->codec, id, src, freq_in, freq_out);
+}
+
 static int wm8994_set_dai_sysclk(struct snd_soc_dai *dai,
                 int clk_id, unsigned int freq, int dir)
 {
@@ -3507,10 +3510,9 @@ static struct snd_soc_dai_ops wm8994_aif3_dai_ops = {
         .set_tristate   = wm8994_set_tristate,
 };
 
-struct snd_soc_dai wm8994_dai[] = {
+static struct snd_soc_dai_driver wm8994_dai[] = {
         {
-                .name = "WM8994 AIF1",
-                .id = 1,
+                .name = "wm8994-aif1",
                 .playback = {
                         .stream_name = "AIF1 Playback",
                         .channels_min = 2,
@@ -3528,8 +3530,7 @@ struct snd_soc_dai wm8994_dai[] = {
                 .ops = &wm8994_aif1_dai_ops,
         },
         {
-                .name = "WM8994 AIF2",
-                .id = 2,
+                .name = "wm8994-aif2",
                 .playback = {
                         .stream_name = "AIF2 Playback",
                         .channels_min = 2,
@@ -3547,8 +3548,7 @@ struct snd_soc_dai wm8994_dai[] = {
                 .ops = &wm8994_aif2_dai_ops,
         },
         {
-                .name = "WM8994 AIF3",
-                .id = 3,
+                .name = "wm8994-aif3",
                 .playback = {
                         .stream_name = "AIF3 Playback",
                         .channels_min = 2,
@@ -3566,20 +3566,17 @@ struct snd_soc_dai wm8994_dai[] = {
                 .ops = &wm8994_aif3_dai_ops,
         }
 };
-EXPORT_SYMBOL_GPL(wm8994_dai);
 
 #ifdef CONFIG_PM
-static int wm8994_suspend(struct platform_device *pdev, pm_message_t state)
+static int wm8994_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 wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         int i, ret;
 
         for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) {
                 memcpy(&wm8994->fll_suspend[i], &wm8994->fll[i],
                        sizeof(struct fll_config));
-                ret = wm8994_set_fll(&codec->dai[0], i + 1, 0, 0, 0);
+                ret = _wm8994_set_fll(codec, i + 1, 0, 0, 0);
                 if (ret < 0)
                         dev_warn(codec->dev, "Failed to stop FLL%d: %d\n",
                                  i + 1, ret);
@@ -3590,10 +3587,8 @@ static int wm8994_suspend(struct platform_device *pdev, pm_message_t state)
         return 0;
 }
 
-static int wm8994_resume(struct platform_device *pdev)
+static int wm8994_resume(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         u16 *reg_cache = codec->reg_cache;
         int i, ret;
@@ -3622,7 +3617,7 @@ static int wm8994_resume(struct platform_device *pdev)
                 if (!wm8994->fll_suspend[i].out)
                         continue;
 
-                ret = wm8994_set_fll(&codec->dai[0], i + 1,
+                ret = _wm8994_set_fll(codec, i + 1,
                                      wm8994->fll_suspend[i].src,
                                      wm8994->fll_suspend[i].in,
                                      wm8994->fll_suspend[i].out);
@@ -3640,7 +3635,7 @@ static int wm8994_resume(struct platform_device *pdev)
 
 static void wm8994_handle_retune_mobile_pdata(struct wm8994_priv *wm8994)
 {
-        struct snd_soc_codec *codec = &wm8994->codec;
+        struct snd_soc_codec *codec = wm8994->codec;
         struct wm8994_pdata *pdata = wm8994->pdata;
         struct snd_kcontrol_new controls[] = {
                 SOC_ENUM_EXT("AIF1.1 EQ Mode",
@@ -3698,16 +3693,16 @@ static void wm8994_handle_retune_mobile_pdata(struct wm8994_priv *wm8994)
         wm8994->retune_mobile_enum.max = wm8994->num_retune_mobile_texts;
         wm8994->retune_mobile_enum.texts = wm8994->retune_mobile_texts;
 
-        ret = snd_soc_add_controls(&wm8994->codec, controls,
+        ret = snd_soc_add_controls(wm8994->codec, controls,
                                    ARRAY_SIZE(controls));
         if (ret != 0)
-                dev_err(wm8994->codec.dev,
+                dev_err(wm8994->codec->dev,
                         "Failed to add ReTune Mobile controls: %d\n", ret);
 }
 
 static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
 {
-        struct snd_soc_codec *codec = &wm8994->codec;
+        struct snd_soc_codec *codec = wm8994->codec;
         struct wm8994_pdata *pdata = wm8994->pdata;
         int ret, i;
 
@@ -3739,7 +3734,7 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
                 wm8994->drc_texts = kmalloc(sizeof(char *)
                                             * pdata->num_drc_cfgs, GFP_KERNEL);
                 if (!wm8994->drc_texts) {
-                        dev_err(wm8994->codec.dev,
+                        dev_err(wm8994->codec->dev,
                                 "Failed to allocate %d DRC config texts\n",
                                 pdata->num_drc_cfgs);
                         return;
@@ -3751,10 +3746,10 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
                 wm8994->drc_enum.max = pdata->num_drc_cfgs;
                 wm8994->drc_enum.texts = wm8994->drc_texts;
 
-                ret = snd_soc_add_controls(&wm8994->codec, controls,
+                ret = snd_soc_add_controls(wm8994->codec, controls,
                                            ARRAY_SIZE(controls));
                 if (ret != 0)
-                        dev_err(wm8994->codec.dev,
+                        dev_err(wm8994->codec->dev,
                                 "Failed to add DRC mode controls: %d\n", ret);
 
                 for (i = 0; i < WM8994_NUM_DRC; i++)
@@ -3767,62 +3762,10 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
         if (pdata->num_retune_mobile_cfgs)
                 wm8994_handle_retune_mobile_pdata(wm8994);
         else
-                snd_soc_add_controls(&wm8994->codec, wm8994_eq_controls,
+                snd_soc_add_controls(wm8994->codec, wm8994_eq_controls,
                                      ARRAY_SIZE(wm8994_eq_controls));
 }
 
-static int wm8994_probe(struct platform_device *pdev)
-{
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec;
-        int ret = 0;
-
-        if (wm8994_codec == NULL) {
-                dev_err(&pdev->dev, "Codec device not registered\n");
-                return -ENODEV;
-        }
-
-        socdev->card->codec = wm8994_codec;
-        codec = wm8994_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);
-                return ret;
-        }
-
-        wm8994_handle_pdata(snd_soc_codec_get_drvdata(codec));
-
-        wm_hubs_add_analogue_controls(codec);
-        snd_soc_add_controls(codec, wm8994_snd_controls,
-                             ARRAY_SIZE(wm8994_snd_controls));
-        snd_soc_dapm_new_controls(codec, wm8994_dapm_widgets,
-                                  ARRAY_SIZE(wm8994_dapm_widgets));
-        wm_hubs_add_analogue_routes(codec, 0, 0);
-        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
-
-        return 0;
-}
-
-static int wm8994_remove(struct platform_device *pdev)
-{
-        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_wm8994 = {
-        .probe =        wm8994_probe,
-        .remove =       wm8994_remove,
-        .suspend =      wm8994_suspend,
-        .resume =       wm8994_resume,
-};
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8994);
-
 /**
  * wm8994_mic_detect - Enable microphone detection via the WM8994 IRQ
  *
@@ -3881,7 +3824,7 @@ EXPORT_SYMBOL_GPL(wm8994_mic_detect);
 static irqreturn_t wm8994_mic_irq(int irq, void *data)
 {
         struct wm8994_priv *priv = data;
-        struct snd_soc_codec *codec = &priv->codec;
+        struct snd_soc_codec *codec = priv->codec;
         int reg;
         int report;
 
@@ -3913,47 +3856,20 @@ static irqreturn_t wm8994_mic_irq(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-static int wm8994_codec_probe(struct platform_device *pdev)
+static int wm8994_codec_probe(struct snd_soc_codec *codec)
 {
-        int ret;
         struct wm8994_priv *wm8994;
-        struct snd_soc_codec *codec;
-        int i;
-        u16 rev;
+        int ret, i, rev;
 
-        if (wm8994_codec) {
-                dev_err(&pdev->dev, "Another WM8994 is registered\n");
-                return -EINVAL;
-        }
+        codec->control_data = dev_get_drvdata(codec->dev->parent);
 
         wm8994 = kzalloc(sizeof(struct wm8994_priv), GFP_KERNEL);
-        if (!wm8994) {
-                dev_err(&pdev->dev, "Failed to allocate private data\n");
+        if (wm8994 == NULL)
                 return -ENOMEM;
-        }
-
-        codec = &wm8994->codec;
-
-        mutex_init(&codec->mutex);
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
-
         snd_soc_codec_set_drvdata(codec, wm8994);
-        codec->control_data = dev_get_drvdata(pdev->dev.parent);
-        codec->name = "WM8994";
-        codec->owner = THIS_MODULE;
-        codec->read = wm8994_read;
-        codec->write = wm8994_write;
-        codec->readable_register = wm8994_readable;
-        codec->bias_level = SND_SOC_BIAS_OFF;
-        codec->set_bias_level = wm8994_set_bias_level;
-        codec->dai = &wm8994_dai[0];
-        codec->num_dai = 3;
-        codec->reg_cache_size = WM8994_MAX_REGISTER;
-        codec->reg_cache = &wm8994->reg_cache;
-        codec->dev = &pdev->dev;
-
-        wm8994->pdata = pdev->dev.parent->platform_data;
+
+        wm8994->pdata = dev_get_platdata(codec->dev->parent);
+        wm8994->codec = codec;
 
         /* Fill the cache with physical values we inherited; don't reset */
         ret = wm8994_bulk_read(codec->control_data, 0,
@@ -3989,25 +3905,25 @@ static int wm8994_codec_probe(struct platform_device *pdev)
         ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC1_DET,
                                  wm8994_mic_irq, "Mic 1 detect", wm8994);
         if (ret != 0)
-                dev_warn(&pdev->dev,
+                dev_warn(codec->dev,
                          "Failed to request Mic1 detect IRQ: %d\n", ret);
 
         ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT,
                                  wm8994_mic_irq, "Mic 1 short", wm8994);
         if (ret != 0)
-                dev_warn(&pdev->dev,
+                dev_warn(codec->dev,
                          "Failed to request Mic1 short IRQ: %d\n", ret);
 
         ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC2_DET,
                                  wm8994_mic_irq, "Mic 2 detect", wm8994);
         if (ret != 0)
-                dev_warn(&pdev->dev,
+                dev_warn(codec->dev,
                          "Failed to request Mic2 detect IRQ: %d\n", ret);
 
         ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_MIC2_SHRT,
                                  wm8994_mic_irq, "Mic 2 short", wm8994);
         if (ret != 0)
-                dev_warn(&pdev->dev,
+                dev_warn(codec->dev,
                          "Failed to request Mic2 short IRQ: %d\n", ret);
 
         /* Remember if AIFnLRCLK is configured as a GPIO.  This should be
@@ -4038,13 +3954,8 @@ static int wm8994_codec_probe(struct platform_device *pdev)
                 wm8994->lrclk_shared[1] = 0;
         }
 
-        for (i = 0; i < ARRAY_SIZE(wm8994_dai); i++)
-                wm8994_dai[i].dev = codec->dev;
-
         wm8994_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        wm8994_codec = codec;
-
         /* Latch volume updates (right only; we always do left then right). */
         snd_soc_update_bits(codec, WM8994_AIF1_DAC1_RIGHT_VOLUME,
                             WM8994_AIF1DAC1_VU, WM8994_AIF1DAC1_VU);
@@ -4081,24 +3992,18 @@ static int wm8994_codec_probe(struct platform_device *pdev)
 
         wm8994_update_class_w(codec);
 
-        ret = snd_soc_register_codec(codec);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register codec: %d\n", ret);
-                goto err_irq;
-        }
-
-        ret = snd_soc_register_dais(wm8994_dai, ARRAY_SIZE(wm8994_dai));
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to register DAIs: %d\n", ret);
-                goto err_codec;
-        }
+        wm8994_handle_pdata(wm8994);
 
-        platform_set_drvdata(pdev, wm8994);
+        wm_hubs_add_analogue_controls(codec);
+        snd_soc_add_controls(codec, wm8994_snd_controls,
+                             ARRAY_SIZE(wm8994_snd_controls));
+        snd_soc_dapm_new_controls(codec, wm8994_dapm_widgets,
+                                  ARRAY_SIZE(wm8994_dapm_widgets));
+        wm_hubs_add_analogue_routes(codec, 0, 0);
+        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
         return 0;
 
-err_codec:
-        snd_soc_unregister_codec(codec);
 err_irq:
         wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC2_SHRT, wm8994);
         wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC2_DET, wm8994);
@@ -4109,31 +4014,50 @@ err:
         return ret;
 }
 
-static int __devexit wm8994_codec_remove(struct platform_device *pdev)
+static int  wm8994_codec_remove(struct snd_soc_codec *codec)
 {
-        struct wm8994_priv *wm8994 = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = &wm8994->codec;
+        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         wm8994_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        snd_soc_unregister_dais(wm8994_dai, ARRAY_SIZE(wm8994_dai));
-        snd_soc_unregister_codec(&wm8994->codec);
+
         wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC2_SHRT, wm8994);
         wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC2_DET, wm8994);
         wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT, wm8994);
         wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_DET, wm8994);
         kfree(wm8994);
-        wm8994_codec = NULL;
 
         return 0;
 }
 
+static struct snd_soc_codec_driver soc_codec_dev_wm8994 = {
+        .probe =        wm8994_codec_probe,
+        .remove =       wm8994_codec_remove,
+        .suspend =      wm8994_suspend,
+        .resume =       wm8994_resume,
+        .read = wm8994_read,
+        .write = wm8994_write,
+        .set_bias_level = wm8994_set_bias_level,
+};
+
+static int __devinit wm8994_probe(struct platform_device *pdev)
+{
+        return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8994,
+                        wm8994_dai, ARRAY_SIZE(wm8994_dai));
+}
+
+static int __devexit wm8994_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_codec(&pdev->dev);
+        return 0;
+}
+
 static struct platform_driver wm8994_codec_driver = {
         .driver = {
                    .name = "wm8994-codec",
                    .owner = THIS_MODULE,
                    },
-        .probe = wm8994_codec_probe,
-        .remove = __devexit_p(wm8994_codec_remove),
+        .probe = wm8994_probe,
+        .remove = __devexit_p(wm8994_remove),
 };
 
 static __init int wm8994_init(void)