diff options
-rw-r--r-- | sound/soc/s3c24xx/s3c-pcm.c | 3 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c-pcm.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c-pcm.c b/sound/soc/s3c24xx/s3c-pcm.c index 825645fbe4de..eadd1bebfe83 100644 --- a/sound/soc/s3c24xx/s3c-pcm.c +++ b/sound/soc/s3c24xx/s3c-pcm.c | |||
@@ -102,11 +102,14 @@ static void s3c_pcm_snd_rxctrl(struct s3c_pcm_info *pcm, int on) | |||
102 | 102 | ||
103 | ctl = readl(regs + S3C_PCM_CTL); | 103 | ctl = readl(regs + S3C_PCM_CTL); |
104 | clkctl = readl(regs + S3C_PCM_CLKCTL); | 104 | clkctl = readl(regs + S3C_PCM_CLKCTL); |
105 | ctl &= ~(S3C_PCM_CTL_RXDIPSTICK_MASK | ||
106 | << S3C_PCM_CTL_RXDIPSTICK_SHIFT); | ||
105 | 107 | ||
106 | if (on) { | 108 | if (on) { |
107 | ctl |= S3C_PCM_CTL_RXDMA_EN; | 109 | ctl |= S3C_PCM_CTL_RXDMA_EN; |
108 | ctl |= S3C_PCM_CTL_RXFIFO_EN; | 110 | ctl |= S3C_PCM_CTL_RXFIFO_EN; |
109 | ctl |= S3C_PCM_CTL_ENABLE; | 111 | ctl |= S3C_PCM_CTL_ENABLE; |
112 | ctl |= (0x20<<S3C_PCM_CTL_RXDIPSTICK_SHIFT); | ||
110 | clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; | 113 | clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; |
111 | } else { | 114 | } else { |
112 | ctl &= ~S3C_PCM_CTL_RXDMA_EN; | 115 | ctl &= ~S3C_PCM_CTL_RXDMA_EN; |
diff --git a/sound/soc/s3c24xx/s3c-pcm.h b/sound/soc/s3c24xx/s3c-pcm.h index 69ff9971692f..f60baa19387d 100644 --- a/sound/soc/s3c24xx/s3c-pcm.h +++ b/sound/soc/s3c24xx/s3c-pcm.h | |||
@@ -22,7 +22,8 @@ | |||
22 | /* PCM_CTL Bit-Fields */ | 22 | /* PCM_CTL Bit-Fields */ |
23 | #define S3C_PCM_CTL_TXDIPSTICK_MASK (0x3f) | 23 | #define S3C_PCM_CTL_TXDIPSTICK_MASK (0x3f) |
24 | #define S3C_PCM_CTL_TXDIPSTICK_SHIFT (13) | 24 | #define S3C_PCM_CTL_TXDIPSTICK_SHIFT (13) |
25 | #define S3C_PCM_CTL_RXDIPSTICK_MSK (0x3f<<7) | 25 | #define S3C_PCM_CTL_RXDIPSTICK_MASK (0x3f) |
26 | #define S3C_PCM_CTL_RXDIPSTICK_SHIFT (7) | ||
26 | #define S3C_PCM_CTL_TXDMA_EN (0x1<<6) | 27 | #define S3C_PCM_CTL_TXDMA_EN (0x1<<6) |
27 | #define S3C_PCM_CTL_RXDMA_EN (0x1<<5) | 28 | #define S3C_PCM_CTL_RXDMA_EN (0x1<<5) |
28 | #define S3C_PCM_CTL_TXMSB_AFTER_FSYNC (0x1<<4) | 29 | #define S3C_PCM_CTL_TXMSB_AFTER_FSYNC (0x1<<4) |