diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-04-22 21:48:45 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 11:34:09 +0100 |
| commit | 19133d2cfd9d6ad8365d94137dcd3e18f760c8e2 (patch) | |
| tree | 4ab402647258a2280b57f7b1b786ea6a3848a7f8 /sound/soc | |
| parent | a8956908bf03418d7264de79e1e988628183f537 (diff) | |
| download | linux-3.10-19133d2cfd9d6ad8365d94137dcd3e18f760c8e2.tar.gz linux-3.10-19133d2cfd9d6ad8365d94137dcd3e18f760c8e2.tar.bz2 linux-3.10-19133d2cfd9d6ad8365d94137dcd3e18f760c8e2.zip | |
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/soc')
| -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 5fd5ed4c0a9..98e131037fd 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++) { |