]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ASoC: Return correct codec clock in s3c64xx-i2s
authorJassi <jassi.brar@samsung.com>
Fri, 18 Sep 2009 06:22:27 +0000 (15:22 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 18 Sep 2009 14:09:37 +0000 (15:09 +0100)
Instead of always returnig pointer to the 'audio-bus' clock,
check which clock is used to generate internal clocks and
then return it's pointer.

Signed-off-by: Jassi <jassi.brar@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/s3c24xx/s3c64xx-i2s.c

index aaf452096be2d83894ed29558768da43d324ff01..43fb253a3429a3b10d8eaebf001940196b025667 100644 (file)
@@ -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);