aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorJoonyoung Shim <jy0922.shim@samsung.com>2009-08-18 08:56:19 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-18 11:02:36 -0400
commit0914b93f4f36d1a0233bd64da9a35e37e72304ec (patch)
tree3494e1abf6be52bc173cca647c8cb35777e03b4b /sound/soc
parentd3c9e9a1390f8a34da8b69e09fa1afa90f5067f4 (diff)
ASoC: Fix data format configuration for S3C64XX IISv2
The data format configuration for S3C64xx IISv2 was hardcoded for IISMOD register. This patch changes to the defined values it. And instead of bits 9 and 10 of IISMOD we should clear bits 13 and 14. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/s3c24xx/s3c-i2s-v2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c
index 1a283170ca92..ebfb2f631054 100644
--- a/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/sound/soc/s3c24xx/s3c-i2s-v2.c
@@ -357,19 +357,19 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,
357#endif 357#endif
358 358
359#ifdef CONFIG_PLAT_S3C64XX 359#ifdef CONFIG_PLAT_S3C64XX
360 iismod &= ~0x606; 360 iismod &= ~(S3C64XX_IISMOD_BLC_MASK | S3C2412_IISMOD_BCLK_MASK);
361 /* Sample size */ 361 /* Sample size */
362 switch (params_format(params)) { 362 switch (params_format(params)) {
363 case SNDRV_PCM_FORMAT_S8: 363 case SNDRV_PCM_FORMAT_S8:
364 /* 8 bit sample, 16fs BCLK */ 364 /* 8 bit sample, 16fs BCLK */
365 iismod |= 0x2004; 365 iismod |= (S3C64XX_IISMOD_BLC_8BIT | S3C2412_IISMOD_BCLK_16FS);
366 break; 366 break;
367 case SNDRV_PCM_FORMAT_S16_LE: 367 case SNDRV_PCM_FORMAT_S16_LE:
368 /* 16 bit sample, 32fs BCLK */ 368 /* 16 bit sample, 32fs BCLK */
369 break; 369 break;
370 case SNDRV_PCM_FORMAT_S24_LE: 370 case SNDRV_PCM_FORMAT_S24_LE:
371 /* 24 bit sample, 48fs BCLK */ 371 /* 24 bit sample, 48fs BCLK */
372 iismod |= 0x4002; 372 iismod |= (S3C64XX_IISMOD_BLC_24BIT | S3C2412_IISMOD_BCLK_48FS);
373 break; 373 break;
374 } 374 }
375#endif 375#endif