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 484858a5f33b57c032069997d8e6c9a4a68ff6fa..5e5e5680580b09f0383c783e9181e8fa804068d4 100644 (file)
--- 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 97327ef09de62a2c64b2930c7264806061ccfa80..6d49bd93717b94071040da6aedd8c054ce1b6e1f 100644 (file)
--- 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: