From f0afaa0c435448e64c503eedfb5a78886718ef81 Mon Sep 17 00:00:00 2001
From: Jassi Brar <jassi.brar@samsung.com>
Date: Wed, 10 Mar 2010 16:48:52 +0900
Subject: [PATCH] --- yaml --- r: 193327 b: refs/heads/master c:
 bf3288260288160e22f85bbf00b281523c14b587 h: refs/heads/master i:   193325:
 3bfe6c4890134f5f64e13e8bea83f96a7f9d5a70   193323:
 d320183896d4cdb079e30aca913d538e1f0d790e   193319:
 fdaaae6999df0b286c28d0d0ebd2975f036621f7   193311:
 e503d37de74ee0870466b0218af6227e7bbc5141 v: v3

---
 [refs]                               | 2 +-
 trunk/sound/soc/s3c24xx/s3c-i2s-v2.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1e4dc4d15724..fcbd292f75a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fad837c16cdd856c68ce2e1335ad0fe836ed8ecd
+refs/heads/master: bf3288260288160e22f85bbf00b281523c14b587
diff --git a/trunk/sound/soc/s3c24xx/s3c-i2s-v2.c b/trunk/sound/soc/s3c24xx/s3c-i2s-v2.c
index b846f563cb50..667431c824d0 100644
--- a/trunk/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/trunk/sound/soc/s3c24xx/s3c-i2s-v2.c
@@ -358,19 +358,16 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,
 #endif
 
 #ifdef CONFIG_PLAT_S3C64XX
-	iismod &= ~(S3C64XX_IISMOD_BLC_MASK | S3C2412_IISMOD_BCLK_MASK);
+	iismod &= ~S3C64XX_IISMOD_BLC_MASK;
 	/* Sample size */
 	switch (params_format(params)) {
 	case SNDRV_PCM_FORMAT_S8:
-		/* 8 bit sample, 16fs BCLK */
-		iismod |= (S3C64XX_IISMOD_BLC_8BIT | S3C2412_IISMOD_BCLK_16FS);
+		iismod |= S3C64XX_IISMOD_BLC_8BIT;
 		break;
 	case SNDRV_PCM_FORMAT_S16_LE:
-		/* 16 bit sample, 32fs BCLK */
 		break;
 	case SNDRV_PCM_FORMAT_S24_LE:
-		/* 24 bit sample, 48fs BCLK */
-		iismod |= (S3C64XX_IISMOD_BLC_24BIT | S3C2412_IISMOD_BCLK_48FS);
+		iismod |= S3C64XX_IISMOD_BLC_24BIT;
 		break;
 	}
 #endif