1 files changed, 102 insertions, 27 deletions

diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c
index 594c6c5b7838..6d9f4c624949 100644
--- a/sound/soc/au1x/dbdma2.c
+++ b/sound/soc/au1x/dbdma2.c
@@ -2,7 +2,7 @@
  * Au12x0/Au1550 PSC ALSA ASoC audio support.
  *
  * (c) 2007-2008 MSC Vertriebsges.m.b.H.,
- *      Manuel Lauss <mano@roarinelk.homelinux.net>
+ *      Manuel Lauss <manuel.lauss@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -51,8 +51,8 @@ struct au1xpsc_audio_dmadata {
         struct snd_pcm_substream *substream;
         unsigned long curr_period;      /* current segment DDMA is working on */
         unsigned long q_period;         /* queue period(s) */
-        unsigned long dma_area;         /* address of queued DMA area */
-        unsigned long dma_area_s;       /* start address of DMA area */
+        dma_addr_t dma_area;            /* address of queued DMA area */
+        dma_addr_t dma_area_s;          /* start address of DMA area */
         unsigned long pos;              /* current byte position being played */
         unsigned long periods;          /* number of SG segments in total */
         unsigned long period_bytes;     /* size in bytes of one SG segment */
@@ -94,8 +94,7 @@ static const struct snd_pcm_hardware au1xpsc_pcm_hardware = {
 
 static void au1x_pcm_queue_tx(struct au1xpsc_audio_dmadata *cd)
 {
-        au1xxx_dbdma_put_source_flags(cd->ddma_chan,
-                                (void *)phys_to_virt(cd->dma_area),
+        au1xxx_dbdma_put_source(cd->ddma_chan, cd->dma_area,
                                 cd->period_bytes, DDMA_FLAGS_IE);
 
         /* update next-to-queue period */
@@ -109,9 +108,8 @@ static void au1x_pcm_queue_tx(struct au1xpsc_audio_dmadata *cd)
 
 static void au1x_pcm_queue_rx(struct au1xpsc_audio_dmadata *cd)
 {
-        au1xxx_dbdma_put_dest_flags(cd->ddma_chan,
-                                (void *)phys_to_virt(cd->dma_area),
-                                cd->period_bytes, DDMA_FLAGS_IE);
+        au1xxx_dbdma_put_dest(cd->ddma_chan, cd->dma_area,
+                              cd->period_bytes, DDMA_FLAGS_IE);
 
         /* update next-to-queue period */
         ++cd->q_period;
@@ -233,7 +231,7 @@ static int au1xpsc_pcm_hw_params(struct snd_pcm_substream *substream,
         pcd->substream = substream;
         pcd->period_bytes = params_period_bytes(params);
         pcd->periods = params_periods(params);
-        pcd->dma_area_s = pcd->dma_area = (unsigned long)runtime->dma_addr;
+        pcd->dma_area_s = pcd->dma_area = runtime->dma_addr;
         pcd->q_period = 0;
         pcd->curr_period = 0;
         pcd->pos = 0;
@@ -333,6 +331,30 @@ static int au1xpsc_pcm_new(struct snd_card *card,
 
 static int au1xpsc_pcm_probe(struct platform_device *pdev)
 {
+        if (!au1xpsc_audio_pcmdma[PCM_TX] || !au1xpsc_audio_pcmdma[PCM_RX])
+                return -ENODEV;
+
+        return 0;
+}
+
+static int au1xpsc_pcm_remove(struct platform_device *pdev)
+{
+        return 0;
+}
+
+/* au1xpsc audio platform */
+struct snd_soc_platform au1xpsc_soc_platform = {
+        .name           = "au1xpsc-pcm-dbdma",
+        .probe          = au1xpsc_pcm_probe,
+        .remove         = au1xpsc_pcm_remove,
+        .pcm_ops        = &au1xpsc_pcm_ops,
+        .pcm_new        = au1xpsc_pcm_new,
+        .pcm_free       = au1xpsc_pcm_free_dma_buffers,
+};
+EXPORT_SYMBOL_GPL(au1xpsc_soc_platform);
+
+static int __devinit au1xpsc_pcm_drvprobe(struct platform_device *pdev)
+{
         struct resource *r;
         int ret;
 
@@ -365,7 +387,9 @@ static int au1xpsc_pcm_probe(struct platform_device *pdev)
         }
         (au1xpsc_audio_pcmdma[PCM_RX])->ddma_id = r->start;
 
-        return 0;
+        ret = snd_soc_register_platform(&au1xpsc_soc_platform);
+        if (!ret)
+                return ret;
 
 out2:
         kfree(au1xpsc_audio_pcmdma[PCM_RX]);
@@ -376,10 +400,12 @@ out1:
         return ret;
 }
 
-static int au1xpsc_pcm_remove(struct platform_device *pdev)
+static int __devexit au1xpsc_pcm_drvremove(struct platform_device *pdev)
 {
         int i;
 
+        snd_soc_unregister_platform(&au1xpsc_soc_platform);
+
         for (i = 0; i < 2; i++) {
                 if (au1xpsc_audio_pcmdma[i]) {
                         au1x_pcm_dbdma_free(au1xpsc_audio_pcmdma[i]);
@@ -391,32 +417,81 @@ static int au1xpsc_pcm_remove(struct platform_device *pdev)
         return 0;
 }
 
-/* au1xpsc audio platform */
-struct snd_soc_platform au1xpsc_soc_platform = {
-        .name           = "au1xpsc-pcm-dbdma",
-        .probe          = au1xpsc_pcm_probe,
-        .remove         = au1xpsc_pcm_remove,
-        .pcm_ops        = &au1xpsc_pcm_ops,
-        .pcm_new        = au1xpsc_pcm_new,
-        .pcm_free       = au1xpsc_pcm_free_dma_buffers,
+static struct platform_driver au1xpsc_pcm_driver = {
+        .driver = {
+                .name   = "au1xpsc-pcm",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = au1xpsc_pcm_drvprobe,
+        .remove         = __devexit_p(au1xpsc_pcm_drvremove),
 };
-EXPORT_SYMBOL_GPL(au1xpsc_soc_platform);
 
-static int __init au1xpsc_audio_dbdma_init(void)
+static int __init au1xpsc_audio_dbdma_load(void)
 {
         au1xpsc_audio_pcmdma[PCM_TX] = NULL;
         au1xpsc_audio_pcmdma[PCM_RX] = NULL;
-        return snd_soc_register_platform(&au1xpsc_soc_platform);
+        return platform_driver_register(&au1xpsc_pcm_driver);
 }
 
-static void __exit au1xpsc_audio_dbdma_exit(void)
+static void __exit au1xpsc_audio_dbdma_unload(void)
 {
-        snd_soc_unregister_platform(&au1xpsc_soc_platform);
+        platform_driver_unregister(&au1xpsc_pcm_driver);
+}
+
+module_init(au1xpsc_audio_dbdma_load);
+module_exit(au1xpsc_audio_dbdma_unload);
+
+
+struct platform_device *au1xpsc_pcm_add(struct platform_device *pdev)
+{
+        struct resource *res, *r;
+        struct platform_device *pd;
+        int id[2];
+        int ret;
+
+        r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+        if (!r)
+                return NULL;
+        id[0] = r->start;
+
+        r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+        if (!r)
+                return NULL;
+        id[1] = r->start;
+
+        res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL);
+        if (!res)
+                return NULL;
+
+        res[0].start = res[0].end = id[0];
+        res[1].start = res[1].end = id[1];
+        res[0].flags = res[1].flags = IORESOURCE_DMA;
+
+        pd = platform_device_alloc("au1xpsc-pcm", -1);
+        if (!pd)
+                goto out;
+
+        pd->resource = res;
+        pd->num_resources = 2;
+
+        ret = platform_device_add(pd);
+        if (!ret)
+                return pd;
+
+        platform_device_put(pd);
+out:
+        kfree(res);
+        return NULL;
 }
+EXPORT_SYMBOL_GPL(au1xpsc_pcm_add);
 
-module_init(au1xpsc_audio_dbdma_init);
-module_exit(au1xpsc_audio_dbdma_exit);
+void au1xpsc_pcm_destroy(struct platform_device *dmapd)
+{
+        if (dmapd)
+                platform_device_unregister(dmapd);
+}
+EXPORT_SYMBOL_GPL(au1xpsc_pcm_destroy);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Au12x0/Au1550 PSC Audio DMA driver");
-MODULE_AUTHOR("Manuel Lauss <mano@roarinelk.homelinux.net>");
+MODULE_AUTHOR("Manuel Lauss");