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>
author: Liam Girdwood <lrg@slimlogic.co.uk> 2010-03-17 16:15:21 -0400
committer: Liam Girdwood <lrg@slimlogic.co.uk> 2010-08-12 09:00:00 -0400
commit: f0fba2ad1b6b53d5360125c41953b7afcd6deff0 (patch)
tree: f6ad50905f8daa616593c978d7ae992e73241180 /sound/soc/s6000/s6000-pcm.c
parent: bda7d2a862e6b788bca2d02d38a07966a9c92e48 (diff)
1 files changed, 61 insertions, 39 deletions
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c
index 9c7f7f00cebb..271fd222bf19 100644
--- a/sound/soc/s6000/s6000-pcm.c
+++ b/sound/soc/s6000/s6000-pcm.c
@@ -65,7 +65,7 @@ static void s6000_pcm_enqueue_dma(struct snd_pcm_substream *substream)
        dma_addr_t dma_pos;
        dma_addr_t src, dst;
-        par = snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
+        par = snd_soc_dai_get_dma_data(soc_runtime->cpu_dai, substream);
        period_size = snd_pcm_lib_period_bytes(substream);
        dma_offset = prtd->period * period_size;
@@ -103,23 +103,25 @@ static irqreturn_t s6000_pcm_irq(int irq, void *data)
 {
        struct snd_pcm *pcm = data;
        struct snd_soc_pcm_runtime *runtime = pcm->private_data;
-        struct s6000_pcm_dma_params *params =
-                snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
        struct s6000_runtime_data *prtd;
        unsigned int has_xrun;
        int i, ret = IRQ_NONE;
-        u32 channel[2] = {
-                [SNDRV_PCM_STREAM_PLAYBACK] = params->dma_out,
-                [SNDRV_PCM_STREAM_CAPTURE] = params->dma_in
-        };
-        has_xrun = params->check_xrun(runtime->dai->cpu_dai);
-        for (i = 0; i < ARRAY_SIZE(channel); ++i) {
+        for (i = 0; i < 2; ++i) {
                struct snd_pcm_substream *substream = pcm->streams[i].substream;
+                struct s6000_pcm_dma_params *params =
+                                        snd_soc_dai_get_dma_data(runtime->cpu_dai, substream);
+                u32 channel;
                unsigned int pending;
-                if (!channel[i])
+                if (substream == SNDRV_PCM_STREAM_PLAYBACK)
+                        channel = params->dma_out;
+                else
+                        channel = params->dma_in;
+                has_xrun = params->check_xrun(runtime->cpu_dai);
+                if (!channel)
                        continue;
                if (unlikely(has_xrun & (1 << i)) &&
@@ -130,8 +132,8 @@ static irqreturn_t s6000_pcm_irq(int irq, void *data)
                        ret = IRQ_HANDLED;
                }
-                pending = s6dmac_int_sources(DMA_MASK_DMAC(channel[i]),
+                pending = s6dmac_int_sources(DMA_MASK_DMAC(channel),
-                                             DMA_INDEX_CHNL(channel[i]));
+                                             DMA_INDEX_CHNL(channel));
                if (pending & 1) {
                        ret = IRQ_HANDLED;
@@ -139,10 +141,10 @@ static irqreturn_t s6000_pcm_irq(int irq, void *data)
                                   snd_pcm_running(substream))) {
                                snd_pcm_period_elapsed(substream);
                                dev_dbg(pcm->dev, "period elapsed %x %x\n",
-                                       s6dmac_cur_src(DMA_MASK_DMAC(channel[i]),
+                                       s6dmac_cur_src(DMA_MASK_DMAC(channel),
-                                                   DMA_INDEX_CHNL(channel[i])),
+                                                   DMA_INDEX_CHNL(channel)),
-                                       s6dmac_cur_dst(DMA_MASK_DMAC(channel[i]),
+                                       s6dmac_cur_dst(DMA_MASK_DMAC(channel),
-                                                   DMA_INDEX_CHNL(channel[i])));
+                                                   DMA_INDEX_CHNL(channel)));
                                prtd = substream->runtime->private_data;
                                spin_lock(&prtd->lock);
                                s6000_pcm_enqueue_dma(substream);
@@ -154,16 +156,16 @@ static irqreturn_t s6000_pcm_irq(int irq, void *data)
                        if (pending & (1 << 3))
                                printk(KERN_WARNING
                                       "s6000-pcm: DMA %x Underflow\n",
-                                       channel[i]);
+                                       channel);
                        if (pending & (1 << 4))
                                printk(KERN_WARNING
                                       "s6000-pcm: DMA %x Overflow\n",
-                                       channel[i]);
+                                       channel);
                        if (pending & 0x1e0)
                                printk(KERN_WARNING
                                       "s6000-pcm: DMA %x Master Error "
                                       "(mask %x)\n",
-                                       channel[i], pending >> 5);
+                                       channel, pending >> 5);
                }
        }
@@ -180,7 +182,7 @@ static int s6000_pcm_start(struct snd_pcm_substream *substream)
        int srcinc;
        u32 dma;
-        par = snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
+        par = snd_soc_dai_get_dma_data(soc_runtime->cpu_dai, substream);
        spin_lock_irqsave(&prtd->lock, flags);
@@ -221,7 +223,7 @@ static int s6000_pcm_stop(struct snd_pcm_substream *substream)
        unsigned long flags;
        u32 channel;
-        par = snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
+        par = snd_soc_dai_get_dma_data(soc_runtime->cpu_dai, substream);
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                channel = par->dma_out;
@@ -246,7 +248,7 @@ static int s6000_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
        struct s6000_pcm_dma_params *par;
        int ret;
-        par = snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
+        par = snd_soc_dai_get_dma_data(soc_runtime->cpu_dai, substream);
        ret = par->trigger(substream, cmd, 0);
        if (ret < 0)
@@ -291,7 +293,7 @@ static snd_pcm_uframes_t s6000_pcm_pointer(struct snd_pcm_substream *substream)
        unsigned int offset;
        dma_addr_t count;
-        par = snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
+        par = snd_soc_dai_get_dma_data(soc_runtime->cpu_dai, substream);
        spin_lock_irqsave(&prtd->lock, flags);
@@ -321,7 +323,7 @@ static int s6000_pcm_open(struct snd_pcm_substream *substream)
        struct s6000_runtime_data *prtd;
        int ret;
-        par = snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
+        par = snd_soc_dai_get_dma_data(soc_runtime->cpu_dai, substream);
        snd_soc_set_runtime_hwparams(substream, &s6000_pcm_hardware);
        ret = snd_pcm_hw_constraint_step(runtime, 0,
@@ -385,7 +387,7 @@ static int s6000_pcm_hw_params(struct snd_pcm_substream *substream,
                return ret;
        }
-        par = snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
+        par = snd_soc_dai_get_dma_data(soc_runtime->cpu_dai, substream);
        if (par->same_rate) {
                spin_lock(&par->lock);
@@ -407,7 +409,7 @@ static int s6000_pcm_hw_free(struct snd_pcm_substream *substream)
 {
        struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
        struct s6000_pcm_dma_params *par =
-                snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
+                snd_soc_dai_get_dma_data(soc_runtime->cpu_dai, substream);
        spin_lock(&par->lock);
        par->in_use &= ~(1 << substream->stream);
@@ -433,7 +435,7 @@ static void s6000_pcm_free(struct snd_pcm *pcm)
 {
        struct snd_soc_pcm_runtime *runtime = pcm->private_data;
        struct s6000_pcm_dma_params *params =
-                snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
+                snd_soc_dai_get_dma_data(runtime->cpu_dai, pcm->streams[0].substream);
        free_irq(params->irq, pcm);
        snd_pcm_lib_preallocate_free_for_all(pcm);
@@ -448,7 +450,8 @@ static int s6000_pcm_new(struct snd_card *card,
        struct s6000_pcm_dma_params *params;
        int res;
-        params = snd_soc_dai_get_dma_data(soc_runtime->dai->cpu_dai, substream);
+        params = snd_soc_dai_get_dma_data(runtime->cpu_dai,
+                        pcm->streams[0].substream);
        if (!card->dev->dma_mask)
                card->dev->dma_mask = &s6000_pcm_dmamask;
@@ -490,25 +493,44 @@ static int s6000_pcm_new(struct snd_card *card,
        return 0;
 }
-struct snd_soc_platform s6000_soc_platform = {
+static struct snd_soc_platform_driver s6000_soc_platform = {
-        .name =         "s6000-audio",
+        .ops =          &s6000_pcm_ops,
-        .pcm_ops =      &s6000_pcm_ops,
        .pcm_new =      s6000_pcm_new,
        .pcm_free =     s6000_pcm_free,
 };
-EXPORT_SYMBOL_GPL(s6000_soc_platform);
-static int __init s6000_pcm_init(void)
+static int __devinit s6000_soc_platform_probe(struct platform_device *pdev)
+{
+        return snd_soc_register_platform(&pdev->dev, &s6000_soc_platform);
+}
+static int __devexit s6000_soc_platform_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_platform(&pdev->dev);
+        return 0;
+}
+static struct platform_driver s6000_pcm_driver = {
+        .driver = {
+                        .name = "s6000-pcm-audio",
+                        .owner = THIS_MODULE,
+        },
+        .probe = s6000_soc_platform_probe,
+        .remove = __devexit_p(s6000_soc_platform_remove),
+};
+static int __init snd_s6000_pcm_init(void)
 {
-        return snd_soc_register_platform(&s6000_soc_platform);
+        return platform_driver_register(&s6000_pcm_driver);
 }
-module_init(s6000_pcm_init);
+module_init(snd_s6000_pcm_init);
-static void __exit s6000_pcm_exit(void)
+static void __exit snd_s6000_pcm_exit(void)
 {
-        snd_soc_unregister_platform(&s6000_soc_platform);
+        platform_driver_unregister(&s6000_pcm_driver);
 }
-module_exit(s6000_pcm_exit);
+module_exit(snd_s6000_pcm_exit);
 MODULE_AUTHOR("Daniel Gloeckner");
 MODULE_DESCRIPTION("Stretch s6000 family PCM DMA module");
author	Liam Girdwood <lrg@slimlogic.co.uk>	2010-03-17 16:15:21 -0400
committer	Liam Girdwood <lrg@slimlogic.co.uk>	2010-08-12 09:00:00 -0400
commit	f0fba2ad1b6b53d5360125c41953b7afcd6deff0 (patch)
tree	f6ad50905f8daa616593c978d7ae992e73241180 /sound/soc/s6000/s6000-pcm.c
parent	bda7d2a862e6b788bca2d02d38a07966a9c92e48 (diff)