diff options
author | Davide Rizzo <davide@elpa.it> | 2008-05-05 14:59:39 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-05-05 14:12:08 +0200 |
commit | 2c36eecfb6471c457994647771d1405502ad5fde (patch) | |
tree | 35e37838f251eb8286978cda8dc52b40e1f102f1 /sound | |
parent | d6426171bab3403cdcd5613d5549f20b0ab0967c (diff) | |
download | kernel_samsung_smdk4412-2c36eecfb6471c457994647771d1405502ad5fde.tar.gz kernel_samsung_smdk4412-2c36eecfb6471c457994647771d1405502ad5fde.tar.bz2 kernel_samsung_smdk4412-2c36eecfb6471c457994647771d1405502ad5fde.zip |
[ALSA] soc - fix S3C2410 i2s programming error
S3C2410 i2s driver currently manages only i2s protocol (and not left
justified one) and slave mode.
With this small patch, other modes are possible.
Signed-off-by: Davide Rizzo <davide@elpa.it>
Acked-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index 4ebcd6a8bf2..1ed6afd4545 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -224,6 +224,7 @@ static int s3c24xx_i2s_set_fmt(struct snd_soc_cpu_dai *cpu_dai, iismod |= S3C2410_IISMOD_SLAVE; break; case SND_SOC_DAIFMT_CBS_CFS: + iismod &= ~S3C2410_IISMOD_SLAVE; break; default: return -EINVAL; @@ -234,6 +235,7 @@ static int s3c24xx_i2s_set_fmt(struct snd_soc_cpu_dai *cpu_dai, iismod |= S3C2410_IISMOD_MSB; break; case SND_SOC_DAIFMT_I2S: + iismod &= ~S3C2410_IISMOD_MSB; break; default: return -EINVAL; |