From 8e2169e26a9d0249c11baac24180e8559cda238b Mon Sep 17 00:00:00 2001
From: Jassi <jassi.brar@samsung.com>
Date: Fri, 18 Sep 2009 15:22:27 +0900
Subject: [PATCH] --- yaml --- r: 170135 b: refs/heads/master c:
 b1cd6b9ec7c749ddfad628c8c12659591ae195e6 h: refs/heads/master i:   170133:
 229e3297b4d8b92aa08dc0477b80676bb0089aca   170131:
 0f6282760cbbc5f858a1c5ab43d6006b0ad3e285   170127:
 566db037828dcb44142ad59dfc400b8b258cf33b v: v3

---
 [refs]                                | 2 +-
 trunk/sound/soc/s3c24xx/s3c64xx-i2s.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index db675433a40d..0847dca37dc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bb014895547eeeb9aa61a654f24e41e15919304
+refs/heads/master: b1cd6b9ec7c749ddfad628c8c12659591ae195e6
diff --git a/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c b/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c
index aaf452096be2..43fb253a3429 100644
--- a/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -124,8 +124,12 @@ static int s3c64xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
 struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai)
 {
 	struct s3c_i2sv2_info *i2s = to_info(dai);
+	u32 iismod = readl(i2s->regs + S3C2412_IISMOD);
 
-	return i2s->iis_cclk;
+	if (iismod & S3C64XX_IISMOD_IMS_SYSMUX)
+		return i2s->iis_cclk;
+	else
+		return i2s->iis_pclk;
 }
 EXPORT_SYMBOL_GPL(s3c64xx_i2s_get_clock);