From: Jassi Brar <jassi.brar@samsung.com>
Date: Tue, 27 Apr 2010 06:56:51 +0000 (+0900)
Subject: ASoC: S3C64XX: I2S: Use s3c2412 defines
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d47ef9c79dd46c1b33696f01b6cf744b77150379;p=linux-beck.git

ASoC: S3C64XX: I2S: Use s3c2412 defines

Now that the fields are defined for s3c2412, use them and avoid having
multiple copies of same defines.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/s3c24xx/regs-i2s-v2.h b/sound/soc/s3c24xx/regs-i2s-v2.h
index 484858a5f33b..5e5e5680580b 100644
--- a/sound/soc/s3c24xx/regs-i2s-v2.h
+++ b/sound/soc/s3c24xx/regs-i2s-v2.h
@@ -73,9 +73,6 @@
 #define S3C64XX_IISMOD_BLC_24BIT	(2 << 13)
 #define S3C64XX_IISMOD_BLC_MASK		(3 << 13)
 
-#define S3C64XX_IISMOD_IMS_PCLK		(0 << 10)
-#define S3C64XX_IISMOD_IMS_SYSMUX	(1 << 10)
-
 #define S3C2412_IISMOD_IMS_SYSMUX	(1 << 10)
 #define S3C2412_IISMOD_SLAVE		(1 << 11)
 #define S3C2412_IISMOD_MODE_TXONLY	(0 << 8)
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c
index 97327ef09de6..6d49bd93717b 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -62,11 +62,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: