diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-04-22 09:48:45 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 06:34:09 -0400 |
commit | 19133d2cfd9d6ad8365d94137dcd3e18f760c8e2 (patch) | |
tree | 4ab402647258a2280b57f7b1b786ea6a3848a7f8 /sound | |
parent | a8956908bf03418d7264de79e1e988628183f537 (diff) |
ASoC: generic-dmaengine-pcm: use a more common dma name
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>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-generic-dmaengine-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 5fd5ed4c0a96..98e131037fd8 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, | |||
227 | return; | 227 | return; |
228 | 228 | ||
229 | if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) { | 229 | if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) { |
230 | pcm->chan[0] = of_dma_request_slave_channel(of_node, "tx_rx"); | 230 | pcm->chan[0] = of_dma_request_slave_channel(of_node, "rx-tx"); |
231 | pcm->chan[1] = pcm->chan[0]; | 231 | pcm->chan[1] = pcm->chan[0]; |
232 | } else { | 232 | } else { |
233 | for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) { | 233 | for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) { |