ENGR00307835-2 ASoC: dmaengine: Add two function for dmaengine_pcm

Add check_xrun and device_reset for dmaengine_pcm

Signed-off-by: Shengjiu Wang <b02247@freescale.com>

2 files changed, 17 insertions, 8 deletions

diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h
index a4735fadf48d..745cde7976f7 100644
--- a/include/sound/dmaengine_pcm.h
+++ b/include/sound/dmaengine_pcm.h
@@ -61,6 +61,8 @@ struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream)
  * @slave_id: Slave requester id for the DMA channel.
  * @filter_data: Custom DMA channel filter data, this will usually be used when
  * requesting the DMA channel.
+ * @check_xrun: check if hardware xrun happen in the cpu dai.
+ * @device_reset: if xrun happened, then do cpu dai reset.
  */
 struct snd_dmaengine_dai_dma_data {
         dma_addr_t addr;
@@ -68,6 +70,16 @@ struct snd_dmaengine_dai_dma_data {
         u32 maxburst;
         unsigned int slave_id;
         void *filter_data;
+        bool (*check_xrun)(struct snd_pcm_substream *substream);
+        void (*device_reset)(struct snd_pcm_substream *substream, bool stop);
+};
+
+struct dmaengine_pcm_runtime_data {
+        struct dma_chan *dma_chan;
+        dma_cookie_t cookie;
+
+        unsigned int pos;
+        dma_async_tx_callback callback;
 };
 
 void snd_dmaengine_pcm_set_config_from_dai_data(
diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c
index aa924d9b7986..f762ac0f9f1c 100644
--- a/sound/soc/soc-dmaengine-pcm.c
+++ b/sound/soc/soc-dmaengine-pcm.c
@@ -5,6 +5,7 @@
  *  Based on:
  *      imx-pcm-dma-mx2.c, Copyright 2009 Sascha Hauer <s.hauer@pengutronix.de>
  *      mxs-pcm.c, Copyright (C) 2011 Freescale Semiconductor, Inc.
+ *      imx-pcm-dma.c, Copyright (C) 2014 Freescale Semiconductor, Inc.
  *      ep93xx-pcm.c, Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
  *                    Copyright (C) 2006 Applied Data Systems
  *
@@ -28,13 +29,6 @@
 
 #include <sound/dmaengine_pcm.h>
 
-struct dmaengine_pcm_runtime_data {
-        struct dma_chan *dma_chan;
-        dma_cookie_t cookie;
-
-        unsigned int pos;
-};
-
 static inline struct dmaengine_pcm_runtime_data *substream_to_prtd(
         const struct snd_pcm_substream *substream)
 {
@@ -166,7 +160,10 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream)
         if (!desc)
                 return -ENOMEM;
 
-        desc->callback = dmaengine_pcm_dma_complete;
+        if (prtd->callback)
+                desc->callback = prtd->callback;
+        else
+                desc->callback = dmaengine_pcm_dma_complete;
         desc->callback_param = substream;
         prtd->cookie = dmaengine_submit(desc);