3 files changed, 16 insertions, 0 deletions

diff --git a/arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h b/arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h
index 07659dad1748..abf2fbc2eb2f 100644
--- a/arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h
+++ b/arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h
@@ -67,6 +67,8 @@
 #define S3C2412_IISMOD_BCLK_MASK        (3 << 1)
 #define S3C2412_IISMOD_8BIT             (1 << 0)
 
+#define S3C64XX_IISMOD_CDCLKCON         (1 << 12)
+
 #define S3C2412_IISPSR_PSREN            (1 << 15)
 
 #define S3C2412_IISFIC_TXFLUSH          (1 << 15)
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c
index 3c06c401d0fb..aaf452096be2 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -99,6 +99,19 @@ static int s3c64xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
                 iismod |= S3C64XX_IISMOD_IMS_SYSMUX;
                 break;
 
+        case S3C64XX_CLKSRC_CDCLK:
+                switch (dir) {
+                case SND_SOC_CLOCK_IN:
+                        iismod |= S3C64XX_IISMOD_CDCLKCON;
+                        break;
+                case SND_SOC_CLOCK_OUT:
+                        iismod &= ~S3C64XX_IISMOD_CDCLKCON;
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                break;
+
         default:
                 return -EINVAL;
         }
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.h b/sound/soc/s3c24xx/s3c64xx-i2s.h
index 02148cee2613..abe7253b55fc 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.h
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.h
@@ -25,6 +25,7 @@ struct clk;
 
 #define S3C64XX_CLKSRC_PCLK     (0)
 #define S3C64XX_CLKSRC_MUX      (1)
+#define S3C64XX_CLKSRC_CDCLK    (2)
 
 extern struct snd_soc_dai s3c64xx_i2s_dai[];