Merge branch 'topic/asoc' into for-linus

Conflicts:
	sound/soc/codecs/ad1938.c

1 files changed, 4 insertions, 65 deletions

diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c
index a72c251401ac..1d85cb85a7d2 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -12,16 +12,12 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
 
 #include <sound/soc.h>
 
-#include <plat/regs-s3c2412-iis.h>
 #include <mach/gpio-bank-d.h>
 #include <mach/gpio-bank-e.h>
 #include <plat/gpio-cfg.h>
@@ -30,6 +26,7 @@
 #include <mach/dma.h>
 
 #include "s3c-dma.h"
+#include "regs-i2s-v2.h"
 #include "s3c64xx-i2s.h"
 
 /* The value should be set to maximum of the total number
@@ -57,55 +54,6 @@ static inline struct s3c_i2sv2_info *to_info(struct snd_soc_dai *cpu_dai)
         return cpu_dai->private_data;
 }
 
-static int s3c64xx_i2s_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);
-
-        switch (clk_id) {
-        case S3C64XX_CLKSRC_PCLK:
-                iismod &= ~S3C64XX_IISMOD_IMS_SYSMUX;
-                break;
-
-        case S3C64XX_CLKSRC_MUX:
-                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;
-        }
-
-        writel(iismod, i2s->regs + S3C2412_IISMOD);
-
-        return 0;
-}
-
-struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai)
-{
-        struct s3c_i2sv2_info *i2s = to_info(dai);
-        u32 iismod = readl(i2s->regs + S3C2412_IISMOD);
-
-        if (iismod & S3C64XX_IISMOD_IMS_SYSMUX)
-                return i2s->iis_cclk;
-        else
-                return i2s->iis_pclk;
-}
-EXPORT_SYMBOL_GPL(s3c64xx_i2s_get_clock);
-
 static int s3c64xx_i2s_probe(struct platform_device *pdev,
                              struct snd_soc_dai *dai)
 {
@@ -130,18 +78,7 @@ static int s3c64xx_i2s_probe(struct platform_device *pdev,
 }
 
 
-#define S3C64XX_I2S_RATES \
-        (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \
-        SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
-        SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
-
-#define S3C64XX_I2S_FMTS \
-        (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\
-         SNDRV_PCM_FMTBIT_S24_LE)
-
-static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops = {
-        .set_sysclk     = s3c64xx_i2s_set_sysclk,       
-};
+static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops;
 
 static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev)
 {
@@ -171,6 +108,8 @@ static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev)
         dai->probe = s3c64xx_i2s_probe;
         dai->ops = &s3c64xx_i2s_dai_ops;
 
+        i2s->feature |= S3C_FEATURE_CDCLKCON;
+
         i2s->dma_capture = &s3c64xx_i2s_pcm_stereo_in[pdev->id];
         i2s->dma_playback = &s3c64xx_i2s_pcm_stereo_out[pdev->id];