diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2017-01-17 14:16:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-23 18:16:33 +0000 |
| commit | b8ab0ccc0b6e517ff595f1b06fb9f578c8b4001f (patch) | |
| tree | e1aef3337536b6f108cf95748d8641ba147fbc28 /sound/soc/samsung/s3c2412-i2s.c | |
| parent | a5de5b74a50113564a1e0850e2da96c37c35e55d (diff) | |
| download | linux-next-b8ab0ccc0b6e517ff595f1b06fb9f578c8b4001f.tar.gz | |
ASoC: Revert "samsung: Remove unneeded initialization of chan_name"
This reverts commit cdaf9af1eaeb539e32bfd6da6310b41ad6c3ba23
which breaks I2S support on the non-DT Samsung SoC platforms,
since the default "tx", "rx" DMA channel names for playback
and capture streams or custom channel names in struct
snd_dmaengine_pcm_config are supported in the ASoC dmaengine
module only for devicetree booting case.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/samsung/s3c2412-i2s.c')
| -rw-r--r-- | sound/soc/samsung/s3c2412-i2s.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 6d0b8897fa6c..0a4718207e6e 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -35,10 +35,12 @@ #include <linux/platform_data/asoc-s3c.h> static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_out = { + .chan_name = "tx", .addr_width = 4, }; static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_in = { + .chan_name = "rx", .addr_width = 4, }; |