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, 61 insertions, 119 deletions

diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index f0e00fd4b435..6b7d71ec0004 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -19,7 +19,6 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
-#include <sound/soc-of-simple.h>
 #include <sound/initval.h>
 
 #include "tlv320aic26.h"
@@ -130,8 +129,7 @@ static int aic26_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 aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
         int fsref, divisor, wlen, pval, jval, dval, qval;
         u16 reg;
@@ -278,8 +276,8 @@ static struct snd_soc_dai_ops aic26_dai_ops = {
         .set_fmt        = aic26_set_fmt,
 };
 
-struct snd_soc_dai aic26_dai = {
-        .name = "tlv320aic26",
+static struct snd_soc_dai_driver aic26_dai = {
+        .name = "tlv320aic26-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 2,
@@ -296,7 +294,6 @@ struct snd_soc_dai aic26_dai = {
         },
         .ops = &aic26_dai_ops,
 };
-EXPORT_SYMBOL_GPL(aic26_dai);
 
 /* ---------------------------------------------------------------------
  * ALSA controls
@@ -319,61 +316,6 @@ static const struct snd_kcontrol_new aic26_snd_controls[] = {
 };
 
 /* ---------------------------------------------------------------------
- * SoC CODEC portion of driver: probe and release routines
- */
-static int aic26_probe(struct platform_device *pdev)
-{
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec;
-        struct aic26 *aic26;
-        int ret, err;
-
-        dev_info(&pdev->dev, "Probing AIC26 SoC CODEC driver\n");
-        dev_dbg(&pdev->dev, "socdev=%p\n", socdev);
-        dev_dbg(&pdev->dev, "codec_data=%p\n", socdev->codec_data);
-
-        /* Fetch the relevant aic26 private data here (it's already been
-         * stored in the .codec pointer) */
-        aic26 = socdev->codec_data;
-        if (aic26 == NULL) {
-                dev_err(&pdev->dev, "aic26: missing codec pointer\n");
-                return -ENODEV;
-        }
-        codec = &aic26->codec;
-        socdev->card->codec = codec;
-
-        dev_dbg(&pdev->dev, "Registering PCMs, dev=%p, socdev->dev=%p\n",
-                &pdev->dev, socdev->dev);
-        /* register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "aic26: failed to create pcms\n");
-                return -ENODEV;
-        }
-
-        /* register controls */
-        dev_dbg(&pdev->dev, "Registering controls\n");
-        err = snd_soc_add_controls(codec, aic26_snd_controls,
-                        ARRAY_SIZE(aic26_snd_controls));
-        WARN_ON(err < 0);
-
-        return 0;
-}
-
-static int aic26_remove(struct platform_device *pdev)
-{
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        snd_soc_free_pcms(socdev);
-        return 0;
-}
-
-struct snd_soc_codec_device aic26_soc_codec_dev = {
-        .probe = aic26_probe,
-        .remove = aic26_remove,
-};
-EXPORT_SYMBOL_GPL(aic26_soc_codec_dev);
-
-/* ---------------------------------------------------------------------
  * SPI device portion of driver: sysfs files for debugging
  */
 
@@ -409,95 +351,95 @@ static ssize_t aic26_keyclick_set(struct device *dev,
 static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set);
 
 /* ---------------------------------------------------------------------
- * SPI device portion of driver: probe and release routines and SPI
- *                               driver registration.
+ * SoC CODEC portion of driver: probe and release routines
  */
-static int aic26_spi_probe(struct spi_device *spi)
+static int aic26_probe(struct snd_soc_codec *codec)
 {
-        struct aic26 *aic26;
-        int ret, i, reg;
-
-        dev_dbg(&spi->dev, "probing tlv320aic26 spi device\n");
-
-        /* Allocate driver data */
-        aic26 = kzalloc(sizeof *aic26, GFP_KERNEL);
-        if (!aic26)
-                return -ENOMEM;
-
-        /* Initialize the driver data */
-        aic26->spi = spi;
-        dev_set_drvdata(&spi->dev, aic26);
+        struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
+        int ret, err, i, reg;
 
-        /* Setup what we can in the codec structure so that the register
-         * access functions will work as expected.  More will be filled
-         * out when it is probed by the SoC CODEC part of this driver */
-        snd_soc_codec_set_drvdata(&aic26->codec, aic26);
-        aic26->codec.name = "aic26";
-        aic26->codec.owner = THIS_MODULE;
-        aic26->codec.dai = &aic26_dai;
-        aic26->codec.num_dai = 1;
-        aic26->codec.read = aic26_reg_read;
-        aic26->codec.write = aic26_reg_write;
-        aic26->master = 1;
-        mutex_init(&aic26->codec.mutex);
-        INIT_LIST_HEAD(&aic26->codec.dapm_widgets);
-        INIT_LIST_HEAD(&aic26->codec.dapm_paths);
-        aic26->codec.reg_cache_size = AIC26_NUM_REGS;
-        aic26->codec.reg_cache = aic26->reg_cache;
-
-        aic26_dai.dev = &spi->dev;
-        ret = snd_soc_register_dai(&aic26_dai);
-        if (ret != 0) {
-                dev_err(&spi->dev, "Failed to register DAI: %d\n", ret);
-                kfree(aic26);
-                return ret;
-        }
+        dev_info(codec->dev, "Probing AIC26 SoC CODEC driver\n");
 
         /* Reset the codec to power on defaults */
-        aic26_reg_write(&aic26->codec, AIC26_REG_RESET, 0xBB00);
+        aic26_reg_write(codec, AIC26_REG_RESET, 0xBB00);
 
         /* Power up CODEC */
-        aic26_reg_write(&aic26->codec, AIC26_REG_POWER_CTRL, 0);
+        aic26_reg_write(codec, AIC26_REG_POWER_CTRL, 0);
 
         /* Audio Control 3 (master mode, fsref rate) */
-        reg = aic26_reg_read(&aic26->codec, AIC26_REG_AUDIO_CTRL3);
+        reg = aic26_reg_read(codec, AIC26_REG_AUDIO_CTRL3);
         reg &= ~0xf800;
         reg |= 0x0800; /* set master mode */
-        aic26_reg_write(&aic26->codec, AIC26_REG_AUDIO_CTRL3, reg);
+        aic26_reg_write(codec, AIC26_REG_AUDIO_CTRL3, reg);
 
         /* Fill register cache */
         for (i = 0; i < ARRAY_SIZE(aic26->reg_cache); i++)
-                aic26_reg_read(&aic26->codec, i);
+                aic26_reg_read(codec, i);
 
         /* Register the sysfs files for debugging */
         /* Create SysFS files */
-        ret = device_create_file(&spi->dev, &dev_attr_keyclick);
+        ret = device_create_file(codec->dev, &dev_attr_keyclick);
         if (ret)
-                dev_info(&spi->dev, "error creating sysfs files\n");
+                dev_info(codec->dev, "error creating sysfs files\n");
 
-#if defined(CONFIG_SND_SOC_OF_SIMPLE)
-        /* Tell the of_soc helper about this codec */
-        of_snd_soc_register_codec(&aic26_soc_codec_dev, aic26, &aic26_dai,
-                                  spi->dev.archdata.of_node);
-#endif
+        /* register controls */
+        dev_dbg(codec->dev, "Registering controls\n");
+        err = snd_soc_add_controls(codec, aic26_snd_controls,
+                        ARRAY_SIZE(aic26_snd_controls));
+        WARN_ON(err < 0);
 
-        dev_dbg(&spi->dev, "SPI device initialized\n");
         return 0;
 }
 
-static int aic26_spi_remove(struct spi_device *spi)
+static struct snd_soc_codec_driver aic26_soc_codec_dev = {
+        .probe = aic26_probe,
+        .read = aic26_reg_read,
+        .write = aic26_reg_write,
+        .reg_cache_size = AIC26_NUM_REGS,
+        .reg_word_size = sizeof(u16),
+};
+
+/* ---------------------------------------------------------------------
+ * SPI device portion of driver: probe and release routines and SPI
+ *                               driver registration.
+ */
+static int aic26_spi_probe(struct spi_device *spi)
 {
-        struct aic26 *aic26 = dev_get_drvdata(&spi->dev);
+        struct aic26 *aic26;
+        int ret;
 
-        snd_soc_unregister_dai(&aic26_dai);
-        kfree(aic26);
+        dev_dbg(&spi->dev, "probing tlv320aic26 spi device\n");
+
+        /* Allocate driver data */
+        aic26 = kzalloc(sizeof *aic26, GFP_KERNEL);
+        if (!aic26)
+                return -ENOMEM;
 
+        /* Initialize the driver data */
+        aic26->spi = spi;
+        dev_set_drvdata(&spi->dev, aic26);
+        aic26->master = 1;
+
+        ret = snd_soc_register_codec(&spi->dev,
+                        &aic26_soc_codec_dev, &aic26_dai, 1);
+        if (ret < 0)
+                kfree(aic26);
+        return ret;
+
+        dev_dbg(&spi->dev, "SPI device initialized\n");
+        return 0;
+}
+
+static int aic26_spi_remove(struct spi_device *spi)
+{
+        snd_soc_unregister_codec(&spi->dev);
+        kfree(spi_get_drvdata(spi));
         return 0;
 }
 
 static struct spi_driver aic26_spi = {
         .driver = {
-                .name = "tlv320aic26",
+                .name = "tlv320aic26-codec",
                 .owner = THIS_MODULE,
         },
         .probe = aic26_spi_probe,