diff mbox

OMAP: PM: Clear DMA channel state after a wakeup

Message ID 1242827910-16136-1-git-send-email-aaro.koskinen@nokia.com (mailing list archive)
State Accepted
Delegated to: Kevin Hilman
Headers show

Commit Message

Koskinen, Aaro (Nokia - FI/Espoo) May 20, 2009, 1:58 p.m. UTC 
Clear DMA channel states so that users can assume a known initial state.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
---
 arch/arm/plat-omap/dma.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

Comments

Kevin Hilman May 20, 2009, 2:26 p.m. UTC | #1 
Aaro Koskinen <aaro.koskinen@nokia.com> writes:

> Clear DMA channel states so that users can assume a known initial state.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>

Thanks, pushing to PM branch.

Kevin

> ---
>  arch/arm/plat-omap/dma.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
> index 9796773..cd53b28 100755
> --- a/arch/arm/plat-omap/dma.c
> +++ b/arch/arm/plat-omap/dma.c
> @@ -2322,6 +2322,8 @@ EXPORT_SYMBOL(omap_dma_global_context_save);
>  
>  void omap_dma_global_context_restore(void)
>  {
> +	int ch;
> +
>  	dma_write(omap_dma_global_context.dma_gcr, GCR);
>  	dma_write(omap_dma_global_context.dma_ocp_sysconfig,
>  		OCP_SYSCONFIG);
> @@ -2336,6 +2338,10 @@ void omap_dma_global_context_restore(void)
>  	 */
>  	if (cpu_is_omap34xx() && (omap_type() != OMAP2_DEVICE_TYPE_GP))
>  		dma_write(0x3 , IRQSTATUS_L0);
> +
> +	for (ch = 0; ch < dma_chan_count; ch++)
> +		if (dma_chan[ch].dev_id != -1)
> +			omap_clear_dma(ch);
>  }
>  EXPORT_SYMBOL(omap_dma_global_context_restore);
>  
> -- 
> 1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 9796773..cd53b28 100755
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2322,6 +2322,8 @@  EXPORT_SYMBOL(omap_dma_global_context_save);
 
 void omap_dma_global_context_restore(void)
 {
+	int ch;
+
 	dma_write(omap_dma_global_context.dma_gcr, GCR);
 	dma_write(omap_dma_global_context.dma_ocp_sysconfig,
 		OCP_SYSCONFIG);
@@ -2336,6 +2338,10 @@  void omap_dma_global_context_restore(void)
 	 */
 	if (cpu_is_omap34xx() && (omap_type() != OMAP2_DEVICE_TYPE_GP))
 		dma_write(0x3 , IRQSTATUS_L0);
+
+	for (ch = 0; ch < dma_chan_count; ch++)
+		if (dma_chan[ch].dev_id != -1)
+			omap_clear_dma(ch);
 }
 EXPORT_SYMBOL(omap_dma_global_context_restore);