[ALSA] soc - Reinitialise DMA on every resume
This one changes the DMA initialisation as it turns out the DMA driver in s3c24xx doesnt store registers between suspend/resume so you have to re-initialise the channels on every resume. Signed-off-by: Graeme Gregory <graeme@openmoko.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
parent
2d6a4ac9ee
commit
96d90e1930
@ -48,7 +48,9 @@ static const struct snd_pcm_hardware s3c24xx_pcm_hardware = {
|
|||||||
.info = SNDRV_PCM_INFO_INTERLEAVED |
|
.info = SNDRV_PCM_INFO_INTERLEAVED |
|
||||||
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
||||||
SNDRV_PCM_INFO_MMAP |
|
SNDRV_PCM_INFO_MMAP |
|
||||||
SNDRV_PCM_INFO_MMAP_VALID,
|
SNDRV_PCM_INFO_MMAP_VALID |
|
||||||
|
SNDRV_PCM_INFO_PAUSE |
|
||||||
|
SNDRV_PCM_INFO_RESUME,
|
||||||
.formats = SNDRV_PCM_FMTBIT_S16_LE |
|
.formats = SNDRV_PCM_FMTBIT_S16_LE |
|
||||||
SNDRV_PCM_FMTBIT_U16_LE |
|
SNDRV_PCM_FMTBIT_U16_LE |
|
||||||
SNDRV_PCM_FMTBIT_U8 |
|
SNDRV_PCM_FMTBIT_U8 |
|
||||||
@ -175,28 +177,6 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* channel needs configuring for mem=>device, increment memory addr,
|
|
||||||
* sync to pclk, half-word transfers to the IIS-FIFO. */
|
|
||||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
|
||||||
s3c2410_dma_devconfig(prtd->params->channel,
|
|
||||||
S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC |
|
|
||||||
S3C2410_DISRCC_APB, prtd->params->dma_addr);
|
|
||||||
|
|
||||||
s3c2410_dma_config(prtd->params->channel,
|
|
||||||
prtd->params->dma_size,
|
|
||||||
S3C2410_DCON_SYNC_PCLK |
|
|
||||||
S3C2410_DCON_HANDSHAKE);
|
|
||||||
} else {
|
|
||||||
s3c2410_dma_config(prtd->params->channel,
|
|
||||||
prtd->params->dma_size,
|
|
||||||
S3C2410_DCON_HANDSHAKE |
|
|
||||||
S3C2410_DCON_SYNC_PCLK);
|
|
||||||
|
|
||||||
s3c2410_dma_devconfig(prtd->params->channel,
|
|
||||||
S3C2410_DMASRC_HW, 0x3,
|
|
||||||
prtd->params->dma_addr);
|
|
||||||
}
|
|
||||||
|
|
||||||
s3c2410_dma_set_buffdone_fn(prtd->params->channel,
|
s3c2410_dma_set_buffdone_fn(prtd->params->channel,
|
||||||
s3c24xx_audio_buffdone);
|
s3c24xx_audio_buffdone);
|
||||||
|
|
||||||
@ -245,6 +225,28 @@ static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream)
|
|||||||
if (!prtd->params)
|
if (!prtd->params)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
/* channel needs configuring for mem=>device, increment memory addr,
|
||||||
|
* sync to pclk, half-word transfers to the IIS-FIFO. */
|
||||||
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||||
|
s3c2410_dma_devconfig(prtd->params->channel,
|
||||||
|
S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC |
|
||||||
|
S3C2410_DISRCC_APB, prtd->params->dma_addr);
|
||||||
|
|
||||||
|
s3c2410_dma_config(prtd->params->channel,
|
||||||
|
prtd->params->dma_size,
|
||||||
|
S3C2410_DCON_SYNC_PCLK |
|
||||||
|
S3C2410_DCON_HANDSHAKE);
|
||||||
|
} else {
|
||||||
|
s3c2410_dma_config(prtd->params->channel,
|
||||||
|
prtd->params->dma_size,
|
||||||
|
S3C2410_DCON_HANDSHAKE |
|
||||||
|
S3C2410_DCON_SYNC_PCLK);
|
||||||
|
|
||||||
|
s3c2410_dma_devconfig(prtd->params->channel,
|
||||||
|
S3C2410_DMASRC_HW, 0x3,
|
||||||
|
prtd->params->dma_addr);
|
||||||
|
}
|
||||||
|
|
||||||
/* flush the DMA channel */
|
/* flush the DMA channel */
|
||||||
s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH);
|
s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH);
|
||||||
prtd->dma_loaded = 0;
|
prtd->dma_loaded = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user