Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cca9012 authored by Seungwhan Youn's avatar Seungwhan Youn Committed by Mark Brown
Browse files

ASoC: S3C: Fix PCM RX FIFO settings 



When PCM capture, sound recorded abnormally because of RX FIFO
threshold settings are missing. So, This patch modify PCM RX FIFO
setting codes same as TX.
And for DMA, if PCM RXFIFO_DIPSTICK is not '0', it doesn't effect
to DMA request, because DMA refer RX_FIFO_EMPTY flag as the DMA
request.

Signed-off-by: default avatarSeungwhan Youn <sw.youn@samsung.com>
Acked-by: default avatarJassi Brar <jassi.brar@samsung.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 6946e037

sound/soc/s3c24xx/s3c-pcm.c

+3 −0
Original line number Diff line number Diff line
@@ -102,11 +102,14 @@ static void s3c_pcm_snd_rxctrl(struct s3c_pcm_info *pcm, int on) 


	ctl = readl(regs + S3C_PCM_CTL);

	clkctl = readl(regs + S3C_PCM_CLKCTL);

	ctl &= ~(S3C_PCM_CTL_RXDIPSTICK_MASK

			 << S3C_PCM_CTL_RXDIPSTICK_SHIFT);



	if (on) {

		ctl |= S3C_PCM_CTL_RXDMA_EN;

		ctl |= S3C_PCM_CTL_RXFIFO_EN;

		ctl |= S3C_PCM_CTL_ENABLE;

		ctl |= (0x20<<S3C_PCM_CTL_RXDIPSTICK_SHIFT);

		clkctl |= S3C_PCM_CLKCTL_SERCLK_EN;

	} else {

		ctl &= ~S3C_PCM_CTL_RXDMA_EN;

sound/soc/s3c24xx/s3c-pcm.h

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
/* PCM_CTL Bit-Fields */

#define S3C_PCM_CTL_TXDIPSTICK_MASK		(0x3f)

#define S3C_PCM_CTL_TXDIPSTICK_SHIFT	(13)

#define S3C_PCM_CTL_RXDIPSTICK_MSK		(0x3f<<7)

#define S3C_PCM_CTL_RXDIPSTICK_MASK		(0x3f)

#define S3C_PCM_CTL_RXDIPSTICK_SHIFT	(7)

#define S3C_PCM_CTL_TXDMA_EN		(0x1<<6)

#define S3C_PCM_CTL_RXDMA_EN		(0x1<<5)

#define S3C_PCM_CTL_TXMSB_AFTER_FSYNC	(0x1<<4)