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, 59 insertions, 95 deletions

diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index f3b4c1d6a82d..7540a509a6f5 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -161,8 +161,7 @@ static int uda134x_startup(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 uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);
         struct snd_pcm_runtime *master_runtime;
 
@@ -194,8 +193,7 @@ static void uda134x_shutdown(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 uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);
 
         if (uda134x->master_substream == substream)
@@ -209,8 +207,7 @@ static int uda134x_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 uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);
         u8 hw_params;
 
@@ -364,7 +361,7 @@ static int uda134x_set_bias_level(struct snd_soc_codec *codec,
                         pd->power(1);
                         /* Sync reg_cache with the hardware */
                         for (i = 0; i < ARRAY_SIZE(uda134x_reg); i++)
-                                codec->write(codec, i, *cache++);
+                                codec->driver->write(codec, i, *cache++);
                 }
                 break;
         case SND_SOC_BIAS_STANDBY:
@@ -465,8 +462,8 @@ static struct snd_soc_dai_ops uda134x_dai_ops = {
         .set_fmt        = uda134x_set_dai_fmt,
 };
 
-struct snd_soc_dai uda134x_dai = {
-        .name = "UDA134X",
+static struct snd_soc_dai_driver uda134x_dai = {
+        .name = "uda134x-hifi",
         /* playback capabilities */
         .playback = {
                 .stream_name = "Playback",
@@ -486,27 +483,21 @@ struct snd_soc_dai uda134x_dai = {
         /* pcm operations */
         .ops = &uda134x_dai_ops,
 };
-EXPORT_SYMBOL(uda134x_dai);
 
-
-static int uda134x_soc_probe(struct platform_device *pdev)
+static int uda134x_soc_probe(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec;
         struct uda134x_priv *uda134x;
-        void *codec_setup_data = socdev->codec_data;
-        int ret = -ENOMEM;
-        struct uda134x_platform_data *pd;
+        struct uda134x_platform_data *pd = dev_get_drvdata(codec->card->dev);
+        int ret;
 
         printk(KERN_INFO "UDA134X SoC Audio Codec\n");
 
-        if (!codec_setup_data) {
+        if (!pd) {
                 printk(KERN_ERR "UDA134X SoC codec: "
                        "missing L3 bitbang function\n");
                 return -ENODEV;
         }
 
-        pd = codec_setup_data;
         switch (pd->model) {
         case UDA134X_UDA1340:
         case UDA134X_UDA1341:
@@ -520,58 +511,22 @@ static int uda134x_soc_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        socdev->card->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
-        if (socdev->card->codec == NULL)
-                return ret;
-
-        codec = socdev->card->codec;
-
         uda134x = kzalloc(sizeof(struct uda134x_priv), GFP_KERNEL);
         if (uda134x == NULL)
-                goto priv_err;
+                return -ENOMEM;
         snd_soc_codec_set_drvdata(codec, uda134x);
 
-        codec->reg_cache = kmemdup(uda134x_reg, sizeof(uda134x_reg),
-                                   GFP_KERNEL);
-        if (codec->reg_cache == NULL)
-                goto reg_err;
-
-        mutex_init(&codec->mutex);
-
-        codec->reg_cache_size = sizeof(uda134x_reg);
-        codec->reg_cache_step = 1;
-
-        codec->name = "UDA134X";
-        codec->owner = THIS_MODULE;
-        codec->dai = &uda134x_dai;
-        codec->num_dai = 1;
-        codec->read = uda134x_read_reg_cache;
-        codec->write = uda134x_write;
-
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
-
-        codec->control_data = codec_setup_data;
+        codec->control_data = pd;
 
         if (pd->power)
                 pd->power(1);
 
         uda134x_reset(codec);
 
-        if (pd->is_powered_on_standby) {
-                codec->set_bias_level = NULL;
+        if (pd->is_powered_on_standby)
                 uda134x_set_bias_level(codec, SND_SOC_BIAS_ON);
-        } else {
-                codec->set_bias_level = uda134x_set_bias_level;
+        else
                 uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-        }
-
-        /* register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-        if (ret < 0) {
-                printk(KERN_ERR "UDA134X: failed to register pcms\n");
-                goto pcm_err;
-        }
 
         switch (pd->model) {
         case UDA134X_UDA1340:
@@ -590,61 +545,42 @@ static int uda134x_soc_probe(struct platform_device *pdev)
         default:
                 printk(KERN_ERR "%s unknown codec type: %d",
                         __func__, pd->model);
-        return -EINVAL;
+                kfree(uda134x);
+                return -EINVAL;
         }
 
         if (ret < 0) {
                 printk(KERN_ERR "UDA134X: failed to register controls\n");
-                goto pcm_err;
+                kfree(uda134x);
+                return ret;
         }
 
         return 0;
-
-pcm_err:
-        kfree(codec->reg_cache);
-reg_err:
-        kfree(snd_soc_codec_get_drvdata(codec));
-priv_err:
-        kfree(codec);
-        return ret;
 }
 
 /* power down chip */
-static int uda134x_soc_remove(struct platform_device *pdev)
+static int uda134x_soc_remove(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
+        struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);
 
         uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         uda134x_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-
-        kfree(snd_soc_codec_get_drvdata(codec));
-        kfree(codec->reg_cache);
-        kfree(codec);
-
+        kfree(uda134x);
         return 0;
 }
 
 #if defined(CONFIG_PM)
-static int uda134x_soc_suspend(struct platform_device *pdev,
+static int uda134x_soc_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;
-
         uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         uda134x_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
-static int uda134x_soc_resume(struct platform_device *pdev)
+static int uda134x_soc_resume(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
-
         uda134x_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
         uda134x_set_bias_level(codec, SND_SOC_BIAS_ON);
         return 0;
@@ -654,25 +590,53 @@ static int uda134x_soc_resume(struct platform_device *pdev)
 #define uda134x_soc_resume NULL
 #endif /* CONFIG_PM */
 
-struct snd_soc_codec_device soc_codec_dev_uda134x = {
+static struct snd_soc_codec_driver soc_codec_dev_uda134x = {
         .probe =        uda134x_soc_probe,
         .remove =       uda134x_soc_remove,
         .suspend =      uda134x_soc_suspend,
         .resume =       uda134x_soc_resume,
+        .reg_cache_size = sizeof(uda134x_reg),
+        .reg_word_size = sizeof(u8),
+        .reg_cache_step = 1,
+        .read = uda134x_read_reg_cache,
+        .write = uda134x_write,
+#ifdef POWER_OFF_ON_STANDBY
+        .set_bias_level = uda134x_set_bias_level,
+#endif
+};
+
+static int __devinit uda134x_codec_probe(struct platform_device *pdev)
+{
+        return snd_soc_register_codec(&pdev->dev,
+                        &soc_codec_dev_uda134x, &uda134x_dai, 1);
+}
+
+static int __devexit uda134x_codec_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_codec(&pdev->dev);
+        return 0;
+}
+
+static struct platform_driver uda134x_codec_driver = {
+        .driver = {
+                .name = "uda134x-codec",
+                .owner = THIS_MODULE,
+        },
+        .probe = uda134x_codec_probe,
+        .remove = __devexit_p(uda134x_codec_remove),
 };
-EXPORT_SYMBOL_GPL(soc_codec_dev_uda134x);
 
-static int __init uda134x_init(void)
+static int __init uda134x_codec_init(void)
 {
-        return snd_soc_register_dai(&uda134x_dai);
+        return platform_driver_register(&uda134x_codec_driver);
 }
-module_init(uda134x_init);
+module_init(uda134x_codec_init);
 
-static void __exit uda134x_exit(void)
+static void __exit uda134x_codec_exit(void)
 {
-        snd_soc_unregister_dai(&uda134x_dai);
+        platform_driver_unregister(&uda134x_codec_driver);
 }
-module_exit(uda134x_exit);
+module_exit(uda134x_codec_exit);
 
 MODULE_DESCRIPTION("UDA134X ALSA soc codec driver");
 MODULE_AUTHOR("Zoltan Devai, Christian Pellegrin <chripell@evolware.org>");