diff options
| author | Mark Brown | 2016-10-25 21:25:42 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-10-25 21:25:42 +0200 |
| commit | a0a594369c8fc09786bb14772207303e70ccca9a (patch) | |
| tree | b4cce6f9e8eb7470bbedb5891d33c96c07bd5086 /sound/soc/samsung/i2s.c | |
| parent | ASoC: s3c24xx_uda134x: Move global variables to driver's data structure (diff) | |
| parent | ASoC: Drop SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag (diff) | |
| download | kernel-qcow2-linux-a0a594369c8fc09786bb14772207303e70ccca9a.tar.gz kernel-qcow2-linux-a0a594369c8fc09786bb14772207303e70ccca9a.tar.xz kernel-qcow2-linux-a0a594369c8fc09786bb14772207303e70ccca9a.zip | |
Merge branch 'topic/dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung
Diffstat (limited to 'sound/soc/samsung/i2s.c')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 588aa0160a3f..e06aa3152ab0 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1305,8 +1305,6 @@ static int samsung_i2s_probe(struct platform_device *pdev) } pri_dai->dma_playback.addr = regs_base + I2STXD; pri_dai->dma_capture.addr = regs_base + I2SRXD; - pri_dai->dma_playback.chan_name = "tx"; - pri_dai->dma_capture.chan_name = "rx"; pri_dai->dma_playback.addr_width = 4; pri_dai->dma_capture.addr_width = 4; pri_dai->quirks = quirks; @@ -1326,7 +1324,6 @@ static int samsung_i2s_probe(struct platform_device *pdev) sec_dai->lock = &pri_dai->spinlock; sec_dai->variant_regs = pri_dai->variant_regs; sec_dai->dma_playback.addr = regs_base + I2STXDS; - sec_dai->dma_playback.chan_name = "tx-sec"; if (!np) { sec_dai->dma_playback.filter_data = i2s_pdata->dma_play_sec; |