From 669920cf67b784a073785b2add94950fa538b956 Mon Sep 17 00:00:00 2001 From: Jassi Brar Date: Tue, 27 Apr 2010 15:56:34 +0900 Subject: [PATCH] --- yaml --- r: 193426 b: refs/heads/master c: d79696ff443eb16a1a13bd7db030a25fee9f44a7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/s3c24xx/s3c2412-i2s.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e1e997b6fbbd..49ac021cc454 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce76f9fd34d4d39fbda330f14b327273551e2f54 +refs/heads/master: d79696ff443eb16a1a13bd7db030a25fee9f44a7 diff --git a/trunk/sound/soc/s3c24xx/s3c2412-i2s.c b/trunk/sound/soc/s3c24xx/s3c2412-i2s.c index cf0c15482c34..ce2daacc4eb9 100644 --- a/trunk/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/trunk/sound/soc/s3c24xx/s3c2412-i2s.c @@ -94,7 +94,13 @@ static int s3c2412_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, struct clk *s3c2412_get_iisclk(void) { - return s3c2412_i2s.iis_clk; + struct s3c_i2sv2_info *i2s = &s3c2412_i2s; + u32 iismod = readl(i2s->regs + S3C2412_IISMOD); + + if (iismod & S3C2412_IISMOD_IMS_SYSMUX) + return i2s->iis_cclk; + else + return i2s->iis_pclk; } EXPORT_SYMBOL_GPL(s3c2412_get_iisclk);