devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vinod Koul <vinod.koul@intel.com>
To: Nicolin Chen <nicoleotsuka@gmail.com>
Cc: s.hauer@pengutronix.de, robh+dt@kernel.org, pawel.moll@arm.com,
	mark.rutland@arm.com, ijc+devicetree@hellion.org.uk,
	galak@codeaurora.org, rdunlap@infradead.org,
	dan.j.williams@intel.com, shawn.guo@linaro.org,
	devicetree@vger.kernel.org, linux-doc@vger.kernel.org,
	linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org
Subject: Re: [PATCH] dma: imx-sdma: Add a new DMATYPE for Shared Peripheral ASRC
Date: Fri, 25 Jul 2014 14:09:12 +0530	[thread overview]
Message-ID: <20140725083912.GK8181@intel.com> (raw)
In-Reply-To: <1402889465-23797-1-git-send-email-nicoleotsuka@gmail.com>

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
> 

-- 

      parent reply	other threads:[~2014-07-25  8:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140725083912.GK8181@intel.com \
    --to=vinod.koul@intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=galak@codeaurora.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=nicoleotsuka@gmail.com \
    --cc=pawel.moll@arm.com \
    --cc=rdunlap@infradead.org \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawn.guo@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).