1 files changed, 35 insertions, 100 deletions

diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 4c849a49c72a..8f220009e0f6 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -29,9 +29,11 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/initval.h>
+#include <sound/dmaengine_pcm.h>
+
+#include <asm/mach-jz4740/dma.h>
 
 #include "jz4740-i2s.h"
-#include "jz4740-pcm.h"
 
 #define JZ_REG_AIC_CONF         0x00
 #define JZ_REG_AIC_CTRL         0x04
@@ -89,8 +91,8 @@ struct jz4740_i2s {
         struct clk *clk_aic;
         struct clk *clk_i2s;
 
-        struct jz4740_pcm_config pcm_config_playback;
-        struct jz4740_pcm_config pcm_config_capture;
+        struct snd_dmaengine_dai_dma_data playback_dma_data;
+        struct snd_dmaengine_dai_dma_data capture_dma_data;
 };
 
 static inline uint32_t jz4740_i2s_read(const struct jz4740_i2s *i2s,
@@ -233,8 +235,6 @@ static int jz4740_i2s_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
 {
         struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);
-        enum jz4740_dma_width dma_width;
-        struct jz4740_pcm_config *pcm_config;
         unsigned int sample_size;
         uint32_t ctrl;
 
@@ -243,11 +243,9 @@ static int jz4740_i2s_hw_params(struct snd_pcm_substream *substream,
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S8:
                 sample_size = 0;
-                dma_width = JZ4740_DMA_WIDTH_8BIT;
                 break;
         case SNDRV_PCM_FORMAT_S16:
                 sample_size = 1;
-                dma_width = JZ4740_DMA_WIDTH_16BIT;
                 break;
         default:
                 return -EINVAL;
@@ -260,22 +258,13 @@ static int jz4740_i2s_hw_params(struct snd_pcm_substream *substream,
                         ctrl |= JZ_AIC_CTRL_MONO_TO_STEREO;
                 else
                         ctrl &= ~JZ_AIC_CTRL_MONO_TO_STEREO;
-
-                pcm_config = &i2s->pcm_config_playback;
-                pcm_config->dma_config.dst_width = dma_width;
-
         } else {
                 ctrl &= ~JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK;
                 ctrl |= sample_size << JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_OFFSET;
-
-                pcm_config = &i2s->pcm_config_capture;
-                pcm_config->dma_config.src_width = dma_width;
         }
 
         jz4740_i2s_write(i2s, JZ_REG_AIC_CTRL, ctrl);
 
-        snd_soc_dai_set_dma_data(dai, substream, pcm_config);
-
         return 0;
 }
 
@@ -342,25 +331,19 @@ static int jz4740_i2s_resume(struct snd_soc_dai *dai)
 
 static void jz4740_i2c_init_pcm_config(struct jz4740_i2s *i2s)
 {
-        struct jz4740_dma_config *dma_config;
+        struct snd_dmaengine_dai_dma_data *dma_data;
 
         /* Playback */
-        dma_config = &i2s->pcm_config_playback.dma_config;
-        dma_config->src_width = JZ4740_DMA_WIDTH_32BIT;
-        dma_config->transfer_size = JZ4740_DMA_TRANSFER_SIZE_16BYTE;
-        dma_config->request_type = JZ4740_DMA_TYPE_AIC_TRANSMIT;
-        dma_config->flags = JZ4740_DMA_SRC_AUTOINC;
-        dma_config->mode = JZ4740_DMA_MODE_SINGLE;
-        i2s->pcm_config_playback.fifo_addr = i2s->phys_base + JZ_REG_AIC_FIFO;
+        dma_data = &i2s->playback_dma_data;
+        dma_data->maxburst = 16;
+        dma_data->slave_id = JZ4740_DMA_TYPE_AIC_TRANSMIT;
+        dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO;
 
         /* Capture */
-        dma_config = &i2s->pcm_config_capture.dma_config;
-        dma_config->dst_width = JZ4740_DMA_WIDTH_32BIT;
-        dma_config->transfer_size = JZ4740_DMA_TRANSFER_SIZE_16BYTE;
-        dma_config->request_type = JZ4740_DMA_TYPE_AIC_RECEIVE;
-        dma_config->flags = JZ4740_DMA_DST_AUTOINC;
-        dma_config->mode = JZ4740_DMA_MODE_SINGLE;
-        i2s->pcm_config_capture.fifo_addr = i2s->phys_base + JZ_REG_AIC_FIFO;
+        dma_data = &i2s->capture_dma_data;
+        dma_data->maxburst = 16;
+        dma_data->slave_id = JZ4740_DMA_TYPE_AIC_RECEIVE;
+        dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO;
 }
 
 static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai)
@@ -371,6 +354,8 @@ static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai)
         clk_prepare_enable(i2s->clk_aic);
 
         jz4740_i2c_init_pcm_config(i2s);
+        snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data,
+                &i2s->capture_dma_data);
 
         conf = (7 << JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET) |
                 (8 << JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET) |
@@ -432,91 +417,41 @@ static const struct snd_soc_component_driver jz4740_i2s_component = {
 static int jz4740_i2s_dev_probe(struct platform_device *pdev)
 {
         struct jz4740_i2s *i2s;
+        struct resource *mem;
         int ret;
 
-        i2s = kzalloc(sizeof(*i2s), GFP_KERNEL);
-
+        i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
         if (!i2s)
                 return -ENOMEM;
 
-        i2s->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!i2s->mem) {
-                ret = -ENOENT;
-                goto err_free;
-        }
-
-        i2s->mem = request_mem_region(i2s->mem->start, resource_size(i2s->mem),
-                                pdev->name);
-        if (!i2s->mem) {
-                ret = -EBUSY;
-                goto err_free;
-        }
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        i2s->base = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(i2s->base))
+                return PTR_ERR(i2s->base);
 
-        i2s->base = ioremap_nocache(i2s->mem->start, resource_size(i2s->mem));
-        if (!i2s->base) {
-                ret = -EBUSY;
-                goto err_release_mem_region;
-        }
+        i2s->phys_base = mem->start;
 
-        i2s->phys_base = i2s->mem->start;
+        i2s->clk_aic = devm_clk_get(&pdev->dev, "aic");
+        if (IS_ERR(i2s->clk_aic))
+                return PTR_ERR(i2s->clk_aic);
 
-        i2s->clk_aic = clk_get(&pdev->dev, "aic");
-        if (IS_ERR(i2s->clk_aic)) {
-                ret = PTR_ERR(i2s->clk_aic);
-                goto err_iounmap;
-        }
-
-        i2s->clk_i2s = clk_get(&pdev->dev, "i2s");
-        if (IS_ERR(i2s->clk_i2s)) {
-                ret = PTR_ERR(i2s->clk_i2s);
-                goto err_clk_put_aic;
-        }
+        i2s->clk_i2s = devm_clk_get(&pdev->dev, "i2s");
+        if (IS_ERR(i2s->clk_i2s))
+                return PTR_ERR(i2s->clk_i2s);
 
         platform_set_drvdata(pdev, i2s);
-        ret = snd_soc_register_component(&pdev->dev, &jz4740_i2s_component,
-                                         &jz4740_i2s_dai, 1);
 
-        if (ret) {
-                dev_err(&pdev->dev, "Failed to register DAI\n");
-                goto err_clk_put_i2s;
-        }
-
-        return 0;
-
-err_clk_put_i2s:
-        clk_put(i2s->clk_i2s);
-err_clk_put_aic:
-        clk_put(i2s->clk_aic);
-err_iounmap:
-        iounmap(i2s->base);
-err_release_mem_region:
-        release_mem_region(i2s->mem->start, resource_size(i2s->mem));
-err_free:
-        kfree(i2s);
-
-        return ret;
-}
+        ret = devm_snd_soc_register_component(&pdev->dev,
+                &jz4740_i2s_component, &jz4740_i2s_dai, 1);
+        if (ret)
+                return ret;
 
-static int jz4740_i2s_dev_remove(struct platform_device *pdev)
-{
-        struct jz4740_i2s *i2s = platform_get_drvdata(pdev);
-
-        snd_soc_unregister_component(&pdev->dev);
-
-        clk_put(i2s->clk_i2s);
-        clk_put(i2s->clk_aic);
-
-        iounmap(i2s->base);
-        release_mem_region(i2s->mem->start, resource_size(i2s->mem));
-
-        kfree(i2s);
-
-        return 0;
+        return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL,
+                SND_DMAENGINE_PCM_FLAG_COMPAT);
 }
 
 static struct platform_driver jz4740_i2s_driver = {
         .probe = jz4740_i2s_dev_probe,
-        .remove = jz4740_i2s_dev_remove,
         .driver = {
                 .name = "jz4740-i2s",
                 .owner = THIS_MODULE,