[PATCH] ASoC: generic-dmaengine-pcm: use a more common dma name

[PATCH] ASoC: generic-dmaengine-pcm: use a more common dma name

[Shawn Guo]

The examples in Documentation/devicetree/bindings/dma/dma.txt recommends
the name for dma channel doing both RX and TX to be "rx-tx".  This
becomes a common pattern that has been adopted by platforms that
converts to generic DMA bindings.  Let's follow this common pattern in
generic-dmaengine-pcm.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 sound/soc/soc-generic-dmaengine-pcm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 5fd5ed4..98e1310 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -227,7 +227,7 @@ static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
 		return;
 
 	if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) {
-		pcm->chan[0] = of_dma_request_slave_channel(of_node, "tx_rx");
+		pcm->chan[0] = of_dma_request_slave_channel(of_node, "rx-tx");
 		pcm->chan[1] = pcm->chan[0];
 	} else {
 		for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
-- 
1.7.9.5

Re: [PATCH] ASoC: generic-dmaengine-pcm: use a more common dma name

[Lars-Peter Clausen]

On 04/22/2013 03:48 PM, Shawn Guo wrote:
> The examples in Documentation/devicetree/bindings/dma/dma.txt recommends
> the name for dma channel doing both RX and TX to be "rx-tx".  This
> becomes a common pattern that has been adopted by platforms that
> converts to generic DMA bindings.  Let's follow this common pattern in
> generic-dmaengine-pcm.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

Acked-by: Lars-Peter Clausen <lars@metafoo.de>

Thanks.

> ---
>  sound/soc/soc-generic-dmaengine-pcm.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
> index 5fd5ed4..98e1310 100644
> --- a/sound/soc/soc-generic-dmaengine-pcm.c
> +++ b/sound/soc/soc-generic-dmaengine-pcm.c
> @@ -227,7 +227,7 @@ static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
>  		return;
>  
>  	if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) {
> -		pcm->chan[0] = of_dma_request_slave_channel(of_node, "tx_rx");
> +		pcm->chan[0] = of_dma_request_slave_channel(of_node, "rx-tx");
>  		pcm->chan[1] = pcm->chan[0];
>  	} else {
>  		for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {

Re: [PATCH] ASoC: generic-dmaengine-pcm: use a more common dma name

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 386 bytes --]

On Mon, Apr 22, 2013 at 09:48:45PM +0800, Shawn Guo wrote:
> The examples in Documentation/devicetree/bindings/dma/dma.txt recommends
> the name for dma channel doing both RX and TX to be "rx-tx".  This
> becomes a common pattern that has been adopted by platforms that
> converts to generic DMA bindings.  Let's follow this common pattern in
> generic-dmaengine-pcm.

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]