[alsa-devel] [PATCH 07/11] ASoC: S3C64XX: I2S: Use s3c2412 defines

Jassi Brar jassi.brar at samsung.com
Tue Apr 27 08:56:51 CEST 2010


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 at samsung.com>
---
 sound/soc/s3c24xx/regs-i2s-v2.h |    3 ---
 sound/soc/s3c24xx/s3c64xx-i2s.c |    4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/sound/soc/s3c24xx/regs-i2s-v2.h b/sound/soc/s3c24xx/regs-i2s-v2.h
index 484858a..5e5e568 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 97327ef..6d49bd9 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:
-- 
1.6.2.5



More information about the Alsa-devel mailing list