1 files changed, 62 insertions, 25 deletions

diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c
index 865f93143bf..13311c8cf96 100644
--- a/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/sound/soc/s3c24xx/s3c-i2s-v2.c
@@ -24,10 +24,9 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <plat/regs-s3c2412-iis.h>
-
 #include <mach/dma.h>
 
+#include "regs-i2s-v2.h"
 #include "s3c-i2s-v2.h"
 #include "s3c-dma.h"
 
@@ -266,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");
@@ -364,6 +342,52 @@ static int s3c_i2sv2_hw_params(struct snd_pcm_substream *substream,
 
         writel(iismod, i2s->regs + S3C2412_IISMOD);
         pr_debug("%s: w: IISMOD: %x\n", __func__, iismod);
+
+        return 0;
+}
+
+static int s3c_i2sv2_set_sysclk(struct snd_soc_dai *cpu_dai,
+                                  int clk_id, unsigned int freq, int dir)
+{
+        struct s3c_i2sv2_info *i2s = to_info(cpu_dai);
+        u32 iismod = readl(i2s->regs + S3C2412_IISMOD);
+
+        pr_debug("Entered %s\n", __func__);
+        pr_debug("%s r: IISMOD: %x\n", __func__, iismod);
+
+        switch (clk_id) {
+        case S3C_I2SV2_CLKSRC_PCLK:
+                iismod &= ~S3C2412_IISMOD_IMS_SYSMUX;
+                break;
+
+        case S3C_I2SV2_CLKSRC_AUDIOBUS:
+                iismod |= S3C2412_IISMOD_IMS_SYSMUX;
+                break;
+
+        case S3C_I2SV2_CLKSRC_CDCLK:
+                /* Error if controller doesn't have the CDCLKCON bit */
+                if (!(i2s->feature & S3C_FEATURE_CDCLKCON))
+                        return -EINVAL;
+
+                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;
+        }
+
+        writel(iismod, i2s->regs + S3C2412_IISMOD);
+        pr_debug("%s w: IISMOD: %x\n", __func__, iismod);
+
         return 0;
 }
 
@@ -538,6 +562,18 @@ static snd_pcm_sframes_t s3c2412_i2s_delay(struct snd_pcm_substream *substream,
         return delay;
 }
 
+struct clk *s3c_i2sv2_get_clock(struct snd_soc_dai *cpu_dai)
+{
+        struct s3c_i2sv2_info *i2s = to_info(cpu_dai);
+        u32 iismod = readl(i2s->regs + S3C2412_IISMOD);
+
+        if (iismod & S3C2412_IISMOD_IMS_SYSMUX)
+                return i2s->iis_cclk;
+        else
+                return i2s->iis_pclk;
+}
+EXPORT_SYMBOL_GPL(s3c_i2sv2_get_clock);
+
 /* default table of all avaialable root fs divisors */
 static unsigned int iis_fs_tab[] = { 256, 512, 384, 768 };
 
@@ -724,6 +760,7 @@ int s3c_i2sv2_register_dai(struct snd_soc_dai *dai)
                 ops->hw_params = s3c_i2sv2_hw_params;
         ops->set_fmt = s3c2412_i2s_set_fmt;
         ops->set_clkdiv = s3c2412_i2s_set_clkdiv;
+        ops->set_sysclk = s3c_i2sv2_set_sysclk;
 
         /* Allow overriding by (for example) IISv4 */
         if (!ops->delay)