linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] dma: imx-sdma: Add a new DMATYPE for Shared Peripheral ASRC
@ 2014-06-16  3:31 Nicolin Chen
  2014-06-21  4:44 ` Shawn Guo
  2014-07-25  8:39 ` Vinod Koul
  0 siblings, 2 replies; 3+ messages in thread
From: Nicolin Chen @ 2014-06-16  3:31 UTC (permalink / raw)
  To: vinod.koul, s.hauer
  Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
	rdunlap, dan.j.williams, shawn.guo, devicetree, linux-doc,
	linux-kernel, dmaengine

Shared Peripheral ASRC, running on SPBA, needs to use shp sciprts for
DMA transfer. So this patch just adds a new DMATYPE for it.

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
---
 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 1 +
 drivers/dma/imx-sdma.c                                 | 5 +++++
 include/linux/platform_data/dma-imx.h                  | 1 +
 3 files changed, 7 insertions(+)

diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
index ee9be99..d2e91f1 100644
--- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
@@ -47,6 +47,7 @@ The full ID of peripheral types can be found below.
 	20	ASRC
 	21	ESAI
 	22	SSI Dual FIFO	(needs firmware ver >= 2)
+	23	Shared ASRC
 
 The third cell specifies the transfer priority as below.
 
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index fc04add..85561dc 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -745,6 +745,11 @@ static void sdma_get_pc(struct sdma_channel *sdmac,
 		emi_2_per = sdma->script_addrs->asrc_2_mcu_addr;
 		per_2_per = sdma->script_addrs->per_2_per_addr;
 		break;
+	case IMX_DMATYPE_ASRC_SP:
+		per_2_emi = sdma->script_addrs->shp_2_mcu_addr;
+		emi_2_per = sdma->script_addrs->mcu_2_shp_addr;
+		per_2_per = sdma->script_addrs->per_2_per_addr;
+		break;
 	case IMX_DMATYPE_MSHC:
 		per_2_emi = sdma->script_addrs->mshc_2_mcu_addr;
 		emi_2_per = sdma->script_addrs->mcu_2_mshc_addr;
diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h
index bcbc6c3..7aa0e89 100644
--- a/include/linux/platform_data/dma-imx.h
+++ b/include/linux/platform_data/dma-imx.h
@@ -40,6 +40,7 @@ enum sdma_peripheral_type {
 	IMX_DMATYPE_ASRC,	/* ASRC */
 	IMX_DMATYPE_ESAI,	/* ESAI */
 	IMX_DMATYPE_SSI_DUAL,	/* SSI Dual FIFO */
+	IMX_DMATYPE_ASRC_SP,	/* Shared ASRC */
 };
 
 enum imx_dma_prio {
-- 
1.8.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] dma: imx-sdma: Add a new DMATYPE for Shared Peripheral ASRC
  2014-06-16  3:31 [PATCH] dma: imx-sdma: Add a new DMATYPE for Shared Peripheral ASRC Nicolin Chen
@ 2014-06-21  4:44 ` Shawn Guo
  2014-07-25  8:39 ` Vinod Koul
  1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2014-06-21  4:44 UTC (permalink / raw)
  To: Nicolin Chen
  Cc: vinod.koul, s.hauer, robh+dt, pawel.moll, mark.rutland,
	ijc+devicetree, galak, rdunlap, dan.j.williams, devicetree,
	linux-doc, linux-kernel, dmaengine

On Mon, Jun 16, 2014 at 11:31:05AM +0800, Nicolin Chen wrote:
> Shared Peripheral ASRC, running on SPBA, needs to use shp sciprts for
> DMA transfer. So this patch just adds a new DMATYPE for it.
> 
> Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>

Acked-by: Shawn Guo <shawn.guo@linaro.org>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] dma: imx-sdma: Add a new DMATYPE for Shared Peripheral ASRC
  2014-06-16  3:31 [PATCH] dma: imx-sdma: Add a new DMATYPE for Shared Peripheral ASRC Nicolin Chen
  2014-06-21  4:44 ` Shawn Guo
@ 2014-07-25  8:39 ` Vinod Koul
  1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2014-07-25  8:39 UTC (permalink / raw)
  To: Nicolin Chen
  Cc: s.hauer, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
	galak, rdunlap, dan.j.williams, shawn.guo, devicetree, linux-doc,
	linux-kernel, dmaengine

On Mon, Jun 16, 2014 at 11:31:05AM +0800, Nicolin Chen wrote:
> Shared Peripheral ASRC, running on SPBA, needs to use shp sciprts for
> DMA transfer. So this patch just adds a new DMATYPE for it.

Applied, thanks

-- 
~Vinod
> 
> Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
> ---
>  Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 1 +
>  drivers/dma/imx-sdma.c                                 | 5 +++++
>  include/linux/platform_data/dma-imx.h                  | 1 +
>  3 files changed, 7 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
> index ee9be99..d2e91f1 100644
> --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
> +++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
> @@ -47,6 +47,7 @@ The full ID of peripheral types can be found below.
>  	20	ASRC
>  	21	ESAI
>  	22	SSI Dual FIFO	(needs firmware ver >= 2)
> +	23	Shared ASRC
>  
>  The third cell specifies the transfer priority as below.
>  
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index fc04add..85561dc 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -745,6 +745,11 @@ static void sdma_get_pc(struct sdma_channel *sdmac,
>  		emi_2_per = sdma->script_addrs->asrc_2_mcu_addr;
>  		per_2_per = sdma->script_addrs->per_2_per_addr;
>  		break;
> +	case IMX_DMATYPE_ASRC_SP:
> +		per_2_emi = sdma->script_addrs->shp_2_mcu_addr;
> +		emi_2_per = sdma->script_addrs->mcu_2_shp_addr;
> +		per_2_per = sdma->script_addrs->per_2_per_addr;
> +		break;
>  	case IMX_DMATYPE_MSHC:
>  		per_2_emi = sdma->script_addrs->mshc_2_mcu_addr;
>  		emi_2_per = sdma->script_addrs->mcu_2_mshc_addr;
> diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h
> index bcbc6c3..7aa0e89 100644
> --- a/include/linux/platform_data/dma-imx.h
> +++ b/include/linux/platform_data/dma-imx.h
> @@ -40,6 +40,7 @@ enum sdma_peripheral_type {
>  	IMX_DMATYPE_ASRC,	/* ASRC */
>  	IMX_DMATYPE_ESAI,	/* ESAI */
>  	IMX_DMATYPE_SSI_DUAL,	/* SSI Dual FIFO */
> +	IMX_DMATYPE_ASRC_SP,	/* Shared ASRC */
>  };
>  
>  enum imx_dma_prio {
> -- 
> 1.8.4
> 

-- 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-07-25  8:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-16  3:31 [PATCH] dma: imx-sdma: Add a new DMATYPE for Shared Peripheral ASRC Nicolin Chen
2014-06-21  4:44 ` Shawn Guo
2014-07-25  8:39 ` Vinod Koul

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).