ASoC: S3C2412: I2S: Debug IMS field

[safe/jmp/linux-2.6] / sound / soc / s3c24xx / s3c-i2s-v2.c

diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c
index cb3652e..b8803a1 100644 (file)
--- a/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/sound/soc/s3c24xx/s3c-i2s-v2.c
@@ -265,35 +265,14 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
        iismod = readl(i2s->regs + S3C2412_IISMOD);
        pr_debug("hw_params r: IISMOD: %x \n", iismod);
 
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
-#define IISMOD_MASTER_MASK S3C2412_IISMOD_MASTER_MASK
-#define IISMOD_SLAVE S3C2412_IISMOD_SLAVE
-#define IISMOD_MASTER S3C2412_IISMOD_MASTER_INTERNAL
-#endif
-
-#if defined(CONFIG_PLAT_S3C64XX)
-/* From Rev1.1 datasheet, we have two master and two slave modes:
- * IMS[11:10]:
- *     00 = master mode, fed from PCLK
- *     01 = master mode, fed from CLKAUDIO
- *     10 = slave mode, using PCLK
- *     11 = slave mode, using I2SCLK
- */
-#define IISMOD_MASTER_MASK (1 << 11)
-#define IISMOD_SLAVE (1 << 11)
-#define IISMOD_MASTER (0 << 11)
-#endif
-
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBM_CFM:
                i2s->master = 0;
-               iismod &= ~IISMOD_MASTER_MASK;
-               iismod |= IISMOD_SLAVE;
+               iismod |= S3C2412_IISMOD_SLAVE;
                break;
        case SND_SOC_DAIFMT_CBS_CFS:
                i2s->master = 1;
-               iismod &= ~IISMOD_MASTER_MASK;
-               iismod |= IISMOD_MASTER;
+               iismod &= ~S3C2412_IISMOD_SLAVE;
                break;
        default:
                pr_err("unknwon master/slave format\n");