[alsa-devel] [PATCH 1/3] ASoC: multi-component - Fix S3C compile error

Seungwhan Youn sw.youn at samsung.com
Thu Jul 15 10:58:46 CEST 2010


This patch fix compile error on using S3C I2S.

Signed-off-by: Seungwhan Youn <sw.youn at samsung.com>
---
 sound/soc/s3c24xx/s3c64xx-i2s.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c
index ad92e10..5017e31 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -56,11 +56,11 @@ static int s3c64xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
 
 	switch (clk_id) {
 	case S3C64XX_CLKSRC_PCLK:
-		iismod &= ~S3C64XX_IISMOD_IMS_SYSMUX;
+		iismod &= ~S3C2412_IISMOD_IMS_SYSMUX;
 		break;
 
 	case S3C64XX_CLKSRC_MUX:
-		iismod |= S3C64XX_IISMOD_IMS_SYSMUX;
+		iismod |= S3C2412_IISMOD_IMS_SYSMUX;
 		break;
 
 	case S3C64XX_CLKSRC_CDCLK:
@@ -90,7 +90,7 @@ struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai)
 	struct s3c_i2sv2_info *i2s = snd_soc_dai_get_drvdata(dai);
 	u32 iismod = readl(i2s->regs + S3C2412_IISMOD);
 
-	if (iismod & S3C64XX_IISMOD_IMS_SYSMUX)
+	if (iismod & S3C2412_IISMOD_IMS_SYSMUX)
 		return i2s->iis_cclk;
 	else
 		return i2s->iis_pclk;
-- 
1.6.2.5



More information about the Alsa-devel mailing list