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, 37 insertions, 138 deletions

diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 3d7dc55305ec..31b35e967398 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -30,8 +30,6 @@
 #include <sound/initval.h>
 #include <sound/tlv.h>
 
-#include "ak4642.h"
-
 #define AK4642_VERSION "0.0.1"
 
 #define PW_MGMT1        0x00
@@ -102,7 +100,6 @@
 #define FS3             (1 << 5)
 #define FS_MASK         (FS0 | FS1 | FS2 | FS3)
 
-struct snd_soc_codec_device soc_codec_dev_ak4642;
 
 /*
  * Playback Volume (table 39)
@@ -123,11 +120,11 @@ static const struct snd_kcontrol_new ak4642_snd_controls[] = {
 
 /* codec private data */
 struct ak4642_priv {
-        struct snd_soc_codec codec;
+        unsigned int sysclk;
+        enum snd_soc_control_type control_type;
+        void *control_data;
 };
 
-static struct snd_soc_codec *ak4642_codec;
-
 /*
  * ak4642 register cache
  */
@@ -393,8 +390,8 @@ static struct snd_soc_dai_ops ak4642_dai_ops = {
         .hw_params      = ak4642_dai_hw_params,
 };
 
-struct snd_soc_dai ak4642_dai = {
-        .name = "AK4642",
+static struct snd_soc_dai_driver ak4642_dai = {
+        .name = "ak4642-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 1,
@@ -410,112 +407,63 @@ struct snd_soc_dai ak4642_dai = {
         .ops = &ak4642_dai_ops,
         .symmetric_rates = 1,
 };
-EXPORT_SYMBOL_GPL(ak4642_dai);
 
-static int ak4642_resume(struct platform_device *pdev)
+static int ak4642_resume(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
-
         ak4642_sync(codec);
         return 0;
 }
 
-/*
- * initialise the AK4642 driver
- * register the mixer and dsp interfaces with the kernel
- */
-static int ak4642_init(struct ak4642_priv *ak4642)
+
+static int ak4642_probe(struct snd_soc_codec *codec)
 {
-        struct snd_soc_codec *codec = &ak4642->codec;
-        int ret = 0;
+        struct ak4642_priv *ak4642 = snd_soc_codec_get_drvdata(codec);
 
-        if (ak4642_codec) {
-                dev_err(codec->dev, "Another ak4642 is registered\n");
-                return -EINVAL;
-        }
+        dev_info(codec->dev, "AK4642 Audio Codec %s", AK4642_VERSION);
 
-        mutex_init(&codec->mutex);
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
-
-        snd_soc_codec_set_drvdata(codec, ak4642);
-        codec->name             = "AK4642";
-        codec->owner            = THIS_MODULE;
-        codec->read             = ak4642_read_reg_cache;
-        codec->write            = ak4642_write;
-        codec->dai              = &ak4642_dai;
-        codec->num_dai          = 1;
         codec->hw_write         = (hw_write_t)i2c_master_send;
-        codec->reg_cache_size   = ARRAY_SIZE(ak4642_reg);
-        codec->reg_cache        = kmemdup(ak4642_reg,
-                                          sizeof(ak4642_reg), GFP_KERNEL);
-
-        if (!codec->reg_cache)
-                return -ENOMEM;
-
-        ak4642_dai.dev = codec->dev;
-        ak4642_codec = codec;
-
-        ret = snd_soc_register_codec(codec);
-        if (ret) {
-                dev_err(codec->dev, "Failed to register codec: %d\n", ret);
-                goto reg_cache_err;
-        }
+        codec->control_data = ak4642->control_data;
 
-        ret = snd_soc_register_dai(&ak4642_dai);
-        if (ret) {
-                dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
-                snd_soc_unregister_codec(codec);
-                goto reg_cache_err;
-        }
-
-        return ret;
-
-reg_cache_err:
-        kfree(codec->reg_cache);
-        codec->reg_cache = NULL;
 
-        return ret;
+        return 0;
 }
 
+static struct snd_soc_codec_driver soc_codec_dev_ak4642 = {
+        .probe =        ak4642_probe,
+        .resume =       ak4642_resume,
+        .read           = ak4642_read_reg_cache,
+        .write          = ak4642_write,
+        .reg_cache_size = ARRAY_SIZE(ak4642_reg),
+        .reg_word_size = sizeof(u8),
+        .reg_cache_default      = ak4642_reg,
+};
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-static int ak4642_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
+                                      const struct i2c_device_id *id)
 {
         struct ak4642_priv *ak4642;
-        struct snd_soc_codec *codec;
         int ret;
 
         ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL);
-        if (!ak4642)
+        if (ak4642 == NULL)
                 return -ENOMEM;
 
-        codec = &ak4642->codec;
-        codec->dev = &i2c->dev;
-
         i2c_set_clientdata(i2c, ak4642);
-        codec->control_data = i2c;
+        ak4642->control_data = i2c;
+        ak4642->control_type = SND_SOC_I2C;
 
-        ret = ak4642_init(ak4642);
-        if (ret < 0) {
-                printk(KERN_ERR "failed to initialise AK4642\n");
+        ret =  snd_soc_register_codec(&i2c->dev,
+                        &soc_codec_dev_ak4642, &ak4642_dai, 1);
+        if (ret < 0)
                 kfree(ak4642);
-        }
-
         return ret;
 }
 
-static int ak4642_i2c_remove(struct i2c_client *client)
+static __devexit int ak4642_i2c_remove(struct i2c_client *client)
 {
-        struct ak4642_priv *ak4642 = i2c_get_clientdata(client);
-
-        snd_soc_unregister_dai(&ak4642_dai);
-        snd_soc_unregister_codec(&ak4642->codec);
-        kfree(ak4642->codec.reg_cache);
-        kfree(ak4642);
-        ak4642_codec = NULL;
-
+        snd_soc_unregister_codec(&client->dev);
+        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
@@ -528,64 +476,15 @@ MODULE_DEVICE_TABLE(i2c, ak4642_i2c_id);
 
 static struct i2c_driver ak4642_i2c_driver = {
         .driver = {
-                .name = "AK4642 I2C Codec",
+                .name = "ak4642-codec",
                 .owner = THIS_MODULE,
         },
-        .probe          = ak4642_i2c_probe,
-        .remove         = ak4642_i2c_remove,
-        .id_table       = ak4642_i2c_id,
+        .probe =    ak4642_i2c_probe,
+        .remove =   __devexit_p(ak4642_i2c_remove),
+        .id_table = ak4642_i2c_id,
 };
-
 #endif
 
-static int ak4642_probe(struct platform_device *pdev)
-{
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        int ret;
-
-        if (!ak4642_codec) {
-                dev_err(&pdev->dev, "Codec device not registered\n");
-                return -ENODEV;
-        }
-
-        socdev->card->codec = ak4642_codec;
-
-        /* register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-        if (ret < 0) {
-                printk(KERN_ERR "ak4642: failed to create pcms\n");
-                goto pcm_err;
-        }
-
-        snd_soc_add_controls(ak4642_codec, ak4642_snd_controls,
-                             ARRAY_SIZE(ak4642_snd_controls));
-
-        dev_info(&pdev->dev, "AK4642 Audio Codec %s", AK4642_VERSION);
-        return ret;
-
-pcm_err:
-        return ret;
-
-}
-
-/* power down chip */
-static int ak4642_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_ak4642 = {
-        .probe =        ak4642_probe,
-        .remove =       ak4642_remove,
-        .resume =       ak4642_resume,
-};
-EXPORT_SYMBOL_GPL(soc_codec_dev_ak4642);
-
 static int __init ak4642_modinit(void)
 {
         int ret = 0;