[PATCH 1/2] dma: mmp_tdma: add DMA_PREP_INTERRUPT flag support

[PATCH 1/2] dma: mmp_tdma: add DMA_PREP_INTERRUPT flag support

[Qiao Zhou]

add DMA_PREP_INTERRUPT flag to support no_period_wakeup, in which
user space app doesn't want audio interrupt to wake up audio threads.

Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
---
 drivers/dma/mmp_tdma.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 6ad30e2..c6bd015 100644
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -148,10 +148,16 @@ static void mmp_tdma_chan_set_desc(struct mmp_tdma_chan *tdmac, dma_addr_t phys)
 					tdmac->reg_base + TDCR);
 }
 
+static void mmp_tdma_enable_irq(struct mmp_tdma_chan *tdmac, bool enable)
+{
+	if (enable)
+		writel(TDIMR_COMP, tdmac->reg_base + TDIMR);
+	else
+		writel(0, tdmac->reg_base + TDIMR);
+}
+
 static void mmp_tdma_enable_chan(struct mmp_tdma_chan *tdmac)
 {
-	/* enable irq */
-	writel(TDIMR_COMP, tdmac->reg_base + TDIMR);
 	/* enable dma chan */
 	writel(readl(tdmac->reg_base + TDCR) | TDCR_CHANEN,
 					tdmac->reg_base + TDCR);
@@ -163,9 +169,6 @@ static void mmp_tdma_disable_chan(struct mmp_tdma_chan *tdmac)
 	writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN,
 					tdmac->reg_base + TDCR);
 
-	/* disable irq */
-	writel(0, tdmac->reg_base + TDIMR);
-
 	tdmac->status = DMA_COMPLETE;
 }
 
@@ -434,6 +437,10 @@ static struct dma_async_tx_descriptor *mmp_tdma_prep_dma_cyclic(
 		i++;
 	}
 
+	/* enable interrupt */
+	if (flags & DMA_PREP_INTERRUPT)
+		mmp_tdma_enable_irq(tdmac, true);
+
 	tdmac->buf_len = buf_len;
 	tdmac->period_len = period_len;
 	tdmac->pos = 0;
@@ -455,6 +462,8 @@ static int mmp_tdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 	switch (cmd) {
 	case DMA_TERMINATE_ALL:
 		mmp_tdma_disable_chan(tdmac);
+		/* disable interrupt */
+		mmp_tdma_enable_irq(tdmac, false);
 		break;
 	case DMA_PAUSE:
 		mmp_tdma_pause_chan(tdmac);
-- 
1.7.0.4

[PATCH 2/2] ASoC: mmp-pcm: add NO_PERIOD_WAKEUP for PCM INFO

[Qiao Zhou]

add NO_PERIOD_WAKEUP to PCM INFO, which supports audio no IRQ mode

Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
---
 sound/soc/pxa/mmp-pcm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
index 5e8d813..64e8b94 100644
--- a/sound/soc/pxa/mmp-pcm.c
+++ b/sound/soc/pxa/mmp-pcm.c
@@ -34,7 +34,8 @@ struct mmp_dma_data {
 		SNDRV_PCM_INFO_MMAP_VALID |	\
 		SNDRV_PCM_INFO_INTERLEAVED |	\
 		SNDRV_PCM_INFO_PAUSE |		\
-		SNDRV_PCM_INFO_RESUME)
+		SNDRV_PCM_INFO_RESUME |		\
+		SNDRV_PCM_INFO_NO_PERIOD_WAKEUP)
 
 static struct snd_pcm_hardware mmp_pcm_hardware[] = {
 	{
-- 
1.7.0.4

[PATCH 2/2] ASoC: mmp-pcm: add NO_PERIOD_WAKEUP for PCM INFO

[Mark Brown]

On Wed, Sep 10, 2014 at 04:40:49PM +0800, Qiao Zhou wrote:
> add NO_PERIOD_WAKEUP to PCM INFO, which supports audio no IRQ mode

Acked-by: Mark Brown <broonie@linaro.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140910/8d65124f/attachment.sig>

[PATCH 2/2] ASoC: mmp-pcm: add NO_PERIOD_WAKEUP for PCM INFO

[Vinod Koul]

On Wed, Sep 10, 2014 at 04:40:49PM +0800, Qiao Zhou wrote:
> add NO_PERIOD_WAKEUP to PCM INFO, which supports audio no IRQ mode

Applied, thanks

-- 
~Vinod

> 
> Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
> ---
>  sound/soc/pxa/mmp-pcm.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
> index 5e8d813..64e8b94 100644
> --- a/sound/soc/pxa/mmp-pcm.c
> +++ b/sound/soc/pxa/mmp-pcm.c
> @@ -34,7 +34,8 @@ struct mmp_dma_data {
>  		SNDRV_PCM_INFO_MMAP_VALID |	\
>  		SNDRV_PCM_INFO_INTERLEAVED |	\
>  		SNDRV_PCM_INFO_PAUSE |		\
> -		SNDRV_PCM_INFO_RESUME)
> +		SNDRV_PCM_INFO_RESUME |		\
> +		SNDRV_PCM_INFO_NO_PERIOD_WAKEUP)
>  
>  static struct snd_pcm_hardware mmp_pcm_hardware[] = {
>  	{
> -- 
> 1.7.0.4
> 

-- 

[PATCH 1/2] dma: mmp_tdma: add DMA_PREP_INTERRUPT flag support

[Vinod Koul]

On Wed, Sep 10, 2014 at 04:40:48PM +0800, Qiao Zhou wrote:
> add DMA_PREP_INTERRUPT flag to support no_period_wakeup, in which
> user space app doesn't want audio interrupt to wake up audio threads.
> 

Applied now, after fixing subsystem name.

-- 
~Vinod