---

yaml --- r: 170135 b: refs/heads/master c: b1cd6b9 h: refs/heads/master i: 170133: 229e329 170131: 0f62827 170127: 566db03 v: v3
git-mirror · Sep 18, 2009 · 8e2169e · 8e2169e
1 parent eec8bfb
commit 8e2169e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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);