mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
faf907c7ba
s3c24xx dma has the auto reload feature, when the the trnasfer is done, CURR_TC(DSTAT[19:0], current value of transfer count) reaches 0, and DMA ACK becomes 1, and then, TC(DCON[19:0]) will be loaded into CURR_TC. So the transmission is repeated. IRQ is issued while auto reload occurs. We change the DISRC and DCON[19:0] in the ISR, but at this time, the auto reload has been performed already. The first block is being re-transmitted by the DMA. So we need rewrite the DISRC and DCON[19:0] for the next block immediatly after the this block has been started to be transported. The function s3c2410_dma_started() is for this perpose, which is called in the form of "s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STARTED);" in s3c24xx_pcm_trigger(). But it is not correct. DMA transmission won't start until DMA REQ signal arrived, it is the time s3c24xx_snd_txctrl(1) or s3c24xx_snd_rxctrl(1) is called in s3c24xx_i2s_trigger(). In the current framework, s3c24xx_pcm_trigger() is always called before s3c24xx_pcm_trigger(). So the s3c2410_dma_started() should be called in s3c24xx_pcm_trigger() after s3c24xx_snd_txctrl(1) or s3c24xx_snd_rxctrl(1) is called in this function. However, s3c2410_dma_started() is dma related, to call this function we should provide the channel number, which is given by substream->runtime->private_data->params->channel. The private_data points to a struct s3c24xx_runtime_data object, which is define in s3c24xx_pcm.c, so s3c2410_dma_started() can't be called in s3c24xx_i2s.c Fix this by moving the call to signal the DMA started to the DAI drivers. Signed-off-by: Shine Liu <liuxian@redflag-linux.com> Signed-off-by: Shine Liu <shinel@foxmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
||
|---|---|---|
| .. | ||
| jive_wm8750.c | ||
| Kconfig | ||
| lm4857.h | ||
| ln2440sbc_alc650.c | ||
| Makefile | ||
| neo1973_gta02_wm8753.c | ||
| neo1973_wm8753.c | ||
| s3c-i2s-v2.c | ||
| s3c-i2s-v2.h | ||
| s3c24xx-ac97.h | ||
| s3c24xx-i2s.c | ||
| s3c24xx-i2s.h | ||
| s3c24xx-pcm.c | ||
| s3c24xx-pcm.h | ||
| s3c24xx_simtec.c | ||
| s3c24xx_simtec.h | ||
| s3c24xx_simtec_hermes.c | ||
| s3c24xx_simtec_tlv320aic23.c | ||
| s3c24xx_uda134x.c | ||
| s3c64xx-i2s.c | ||
| s3c64xx-i2s.h | ||
| s3c2412-i2s.c | ||
| s3c2412-i2s.h | ||
| s3c2443-ac97.c | ||
| smdk2443_wm9710.c | ||