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, 49 insertions, 132 deletions

diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 8f294066b0ed..850299786e02 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -65,7 +65,7 @@ static struct regulator_bulk_data power[] = {
 
 /* codec private data */
 struct wm8400_priv {
-        struct snd_soc_codec codec;
+        struct snd_soc_codec *codec;
         struct wm8400 *wm8400;
         u16 fake_register;
         unsigned int sysclk;
@@ -1163,8 +1163,7 @@ static int wm8400_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;
         u16 audio1 = wm8400_read(codec, WM8400_AUDIO_INTERFACE_1);
 
         audio1 &= ~WM8400_AIF_WL_MASK;
@@ -1332,10 +1331,9 @@ static struct snd_soc_dai_ops wm8400_dai_ops = {
  * 1. ADC/DAC on Primary Interface
  * 2. ADC on Primary Interface/DAC on secondary
  */
-struct snd_soc_dai wm8400_dai = {
+static struct snd_soc_dai_driver wm8400_dai = {
 /* ADC/DAC on primary */
-        .name = "WM8400 ADC/DAC Primary",
-        .id = 1,
+        .name = "wm8400-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 1,
@@ -1352,147 +1350,53 @@ struct snd_soc_dai wm8400_dai = {
         },
         .ops = &wm8400_dai_ops,
 };
-EXPORT_SYMBOL_GPL(wm8400_dai);
 
-static int wm8400_suspend(struct platform_device *pdev, pm_message_t state)
+static int wm8400_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;
-
         wm8400_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
         return 0;
 }
 
-static int wm8400_resume(struct platform_device *pdev)
+static int wm8400_resume(struct snd_soc_codec *codec)
 {
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->card->codec;
-
         wm8400_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         return 0;
 }
 
-static struct snd_soc_codec *wm8400_codec;
-
-static int wm8400_probe(struct platform_device *pdev)
-{
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec;
-        int ret;
-
-        if (!wm8400_codec) {
-                dev_err(&pdev->dev, "wm8400 not yet discovered\n");
-                return -ENODEV;
-        }
-        codec = wm8400_codec;
-
-        socdev->card->codec = codec;
-
-        /* register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to create pcms\n");
-                goto pcm_err;
-        }
-
-        wm8400_add_controls(codec);
-        wm8400_add_widgets(codec);
-
-pcm_err:
-        return ret;
-}
-
-/* power down chip */
-static int wm8400_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_wm8400 = {
-        .probe =        wm8400_probe,
-        .remove =       wm8400_remove,
-        .suspend =      wm8400_suspend,
-        .resume =       wm8400_resume,
-};
-
 static void wm8400_probe_deferred(struct work_struct *work)
 {
         struct wm8400_priv *priv = container_of(work, struct wm8400_priv,
                                                 work);
-        struct snd_soc_codec *codec = &priv->codec;
-        int ret;
+        struct snd_soc_codec *codec = priv->codec;
 
         /* charge output caps */
         wm8400_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
-        /* We're done, tell the subsystem. */
-        ret = snd_soc_register_codec(codec);
-        if (ret != 0) {
-                dev_err(priv->wm8400->dev,
-                        "Failed to register codec: %d\n", ret);
-                goto err;
-        }
-
-        ret = snd_soc_register_dai(&wm8400_dai);
-        if (ret != 0) {
-                dev_err(priv->wm8400->dev,
-                        "Failed to register DAI: %d\n", ret);
-                goto err_codec;
-        }
-
-        return;
-
-err_codec:
-        snd_soc_unregister_codec(codec);
-err:
-        wm8400_set_bias_level(codec, SND_SOC_BIAS_OFF);
 }
 
-static int wm8400_codec_probe(struct platform_device *dev)
+static int wm8400_codec_probe(struct snd_soc_codec *codec)
 {
+        struct wm8400 *wm8400 = dev_get_platdata(codec->dev);
         struct wm8400_priv *priv;
         int ret;
         u16 reg;
-        struct snd_soc_codec *codec;
 
         priv = kzalloc(sizeof(struct wm8400_priv), GFP_KERNEL);
         if (priv == NULL)
                 return -ENOMEM;
 
-        codec = &priv->codec;
         snd_soc_codec_set_drvdata(codec, priv);
-        codec->control_data = dev_get_drvdata(&dev->dev);
-        priv->wm8400 = dev_get_drvdata(&dev->dev);
+        codec->control_data = priv->wm8400 = wm8400;
+        priv->codec = codec;
 
-        ret = regulator_bulk_get(priv->wm8400->dev,
+        ret = regulator_bulk_get(wm8400->dev,
                                  ARRAY_SIZE(power), &power[0]);
         if (ret != 0) {
-                dev_err(&dev->dev, "Failed to get regulators: %d\n", ret);
+                dev_err(codec->dev, "Failed to get regulators: %d\n", ret);
                 goto err;
         }
 
-        codec->dev = &dev->dev;
-        wm8400_dai.dev = &dev->dev;
-
-        codec->name = "WM8400";
-        codec->owner = THIS_MODULE;
-        codec->read = wm8400_read;
-        codec->write = wm8400_write;
-        codec->bias_level = SND_SOC_BIAS_OFF;
-        codec->set_bias_level = wm8400_set_bias_level;
-        codec->dai = &wm8400_dai;
-        codec->num_dai = 1;
-        codec->reg_cache_size = WM8400_REGISTER_COUNT;
-        mutex_init(&codec->mutex);
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
         INIT_WORK(&priv->work, wm8400_probe_deferred);
 
         wm8400_codec_reset(codec);
@@ -1511,65 +1415,78 @@ static int wm8400_codec_probe(struct platform_device *dev)
         wm8400_write(codec, WM8400_LEFT_OUTPUT_VOLUME, 0x50 | (1<<8));
         wm8400_write(codec, WM8400_RIGHT_OUTPUT_VOLUME, 0x50 | (1<<8));
 
-        wm8400_codec = codec;
-
         if (!schedule_work(&priv->work)) {
                 ret = -EINVAL;
                 goto err_regulator;
         }
-
+        wm8400_add_controls(codec);
+        wm8400_add_widgets(codec);
         return 0;
 
 err_regulator:
-        wm8400_codec = NULL;
         regulator_bulk_free(ARRAY_SIZE(power), power);
 err:
         kfree(priv);
         return ret;
 }
 
-static int __exit wm8400_codec_remove(struct platform_device *dev)
+static int  wm8400_codec_remove(struct snd_soc_codec *codec)
 {
-        struct wm8400_priv *priv = snd_soc_codec_get_drvdata(wm8400_codec);
+        struct wm8400_priv *priv = snd_soc_codec_get_drvdata(codec);
         u16 reg;
 
-        snd_soc_unregister_dai(&wm8400_dai);
-        snd_soc_unregister_codec(wm8400_codec);
-
-        reg = wm8400_read(wm8400_codec, WM8400_POWER_MANAGEMENT_1);
-        wm8400_write(wm8400_codec, WM8400_POWER_MANAGEMENT_1,
+        reg = wm8400_read(codec, WM8400_POWER_MANAGEMENT_1);
+        wm8400_write(codec, WM8400_POWER_MANAGEMENT_1,
                      reg & (~WM8400_CODEC_ENA));
 
         regulator_bulk_free(ARRAY_SIZE(power), power);
         kfree(priv);
 
-        wm8400_codec = NULL;
+        return 0;
+}
+
+static struct snd_soc_codec_driver soc_codec_dev_wm8400 = {
+        .probe =        wm8400_codec_probe,
+        .remove =       wm8400_codec_remove,
+        .suspend =      wm8400_suspend,
+        .resume =       wm8400_resume,
+        .read = wm8400_read,
+        .write = wm8400_write,
+        .set_bias_level = wm8400_set_bias_level,
+};
+
+static int __devinit wm8400_probe(struct platform_device *pdev)
+{
+        return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8400,
+                        &wm8400_dai, 1);
+}
 
+static int __devexit wm8400_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_codec(&pdev->dev);
         return 0;
 }
 
 static struct platform_driver wm8400_codec_driver = {
         .driver = {
-                .name = "wm8400-codec",
-                .owner = THIS_MODULE,
-        },
-        .probe = wm8400_codec_probe,
-        .remove = __exit_p(wm8400_codec_remove),
+                   .name = "wm8400-codec",
+                   .owner = THIS_MODULE,
+                   },
+        .probe = wm8400_probe,
+        .remove = __devexit_p(wm8400_remove),
 };
 
-static int __init wm8400_codec_init(void)
+static __init int wm8400_init(void)
 {
         return platform_driver_register(&wm8400_codec_driver);
 }
-module_init(wm8400_codec_init);
+module_init(wm8400_init);
 
-static void __exit wm8400_codec_exit(void)
+static __exit void wm8400_exit(void)
 {
         platform_driver_unregister(&wm8400_codec_driver);
 }
-module_exit(wm8400_codec_exit);
-
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8400);
+module_exit(wm8400_exit);
 
 MODULE_DESCRIPTION("ASoC WM8400 driver");
 MODULE_AUTHOR("Mark Brown");