5 files changed, 195 insertions, 77 deletions

diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index 289fadf60b10..906709e6dd5f 100644
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -345,9 +345,11 @@ static void lm4857_write_regs(void)
 static int lm4857_get_reg(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        int reg = kcontrol->private_value & 0xFF;
-        int shift = (kcontrol->private_value >> 8) & 0x0F;
-        int mask = (kcontrol->private_value >> 16) & 0xFF;
+        struct soc_mixer_control *mc =
+                (struct soc_mixer_control *)kcontrol->private_value;
+        int reg = mc->reg;
+        int shift = mc->shift;
+        int mask = mc->max;
 
         pr_debug("Entered %s\n", __func__);
 
@@ -358,9 +360,11 @@ static int lm4857_get_reg(struct snd_kcontrol *kcontrol,
 static int lm4857_set_reg(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        int reg = kcontrol->private_value & 0xFF;
-        int shift = (kcontrol->private_value >> 8) & 0x0F;
-        int mask = (kcontrol->private_value >> 16) & 0xFF;
+        struct soc_mixer_control *mc =
+                (struct soc_mixer_control *)kcontrol->private_value;
+        int reg = mc->reg;
+        int shift = mc->shift;
+        int mask = mc->max;
 
         if (((lm4857_regs[reg] >> shift) & mask) ==
                 ucontrol->value.integer.value[0])
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c
index ab680aac3fcb..1a283170ca92 100644
--- a/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/sound/soc/s3c24xx/s3c-i2s-v2.c
@@ -37,6 +37,20 @@
 
 #include "s3c-i2s-v2.h"
 
+#undef S3C_IIS_V2_SUPPORTED
+
+#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#define S3C_IIS_V2_SUPPORTED
+#endif
+
+#ifdef CONFIG_PLAT_S3C64XX
+#define S3C_IIS_V2_SUPPORTED
+#endif
+
+#ifndef S3C_IIS_V2_SUPPORTED
+#error Unsupported CPU model
+#endif
+
 #define S3C2412_I2S_DEBUG_CON 0
 
 static inline struct s3c_i2sv2_info *to_info(struct snd_soc_dai *cpu_dai)
@@ -75,7 +89,7 @@ static inline void dbg_showcon(const char *fn, u32 con)
 
 
 /* Turn on or off the transmission path. */
-void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
+static void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
 {
         void __iomem *regs = i2s->regs;
         u32 fic, con, mod;
@@ -105,7 +119,9 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
                         break;
 
                 default:
-                        dev_err(i2s->dev, "TXEN: Invalid MODE in IISMOD\n");
+                        dev_err(i2s->dev, "TXEN: Invalid MODE %x in IISMOD\n",
+                                mod & S3C2412_IISMOD_MODE_MASK);
+                        break;
                 }
 
                 writel(con, regs + S3C2412_IISCON);
@@ -132,7 +148,9 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
                         break;
 
                 default:
-                        dev_err(i2s->dev, "TXDIS: Invalid MODE in IISMOD\n");
+                        dev_err(i2s->dev, "TXDIS: Invalid MODE %x in IISMOD\n",
+                                mod & S3C2412_IISMOD_MODE_MASK);
+                        break;
                 }
 
                 writel(mod, regs + S3C2412_IISMOD);
@@ -143,9 +161,8 @@ void s3c2412_snd_txctrl(struct s3c_i2sv2_info *i2s, int on)
         dbg_showcon(__func__, con);
         pr_debug("%s: IIS: CON=%x MOD=%x FIC=%x\n", __func__, con, mod, fic);
 }
-EXPORT_SYMBOL_GPL(s3c2412_snd_txctrl);
 
-void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
+static void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
 {
         void __iomem *regs = i2s->regs;
         u32 fic, con, mod;
@@ -175,7 +192,8 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
                         break;
 
                 default:
-                        dev_err(i2s->dev, "RXEN: Invalid MODE in IISMOD\n");
+                        dev_err(i2s->dev, "RXEN: Invalid MODE %x in IISMOD\n",
+                                mod & S3C2412_IISMOD_MODE_MASK);
                 }
 
                 writel(mod, regs + S3C2412_IISMOD);
@@ -199,7 +217,8 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
                         break;
 
                 default:
-                        dev_err(i2s->dev, "RXEN: Invalid MODE in IISMOD\n");
+                        dev_err(i2s->dev, "RXDIS: Invalid MODE %x in IISMOD\n",
+                                mod & S3C2412_IISMOD_MODE_MASK);
                 }
 
                 writel(con, regs + S3C2412_IISCON);
@@ -209,7 +228,6 @@ void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on)
         fic = readl(regs + S3C2412_IISFIC);
         pr_debug("%s: IIS: CON=%x MOD=%x FIC=%x\n", __func__, con, mod, fic);
 }
-EXPORT_SYMBOL_GPL(s3c2412_snd_rxctrl);
 
 /*
  * Wait for the LR signal to allow synchronisation to the L/R clock
@@ -266,7 +284,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
  */
 #define IISMOD_MASTER_MASK (1 << 11)
 #define IISMOD_SLAVE (1 << 11)
-#define IISMOD_MASTER (0x0)
+#define IISMOD_MASTER (0 << 11)
 #endif
 
         switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
@@ -281,7 +299,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
                 iismod |= IISMOD_MASTER;
                 break;
         default:
-                pr_debug("unknwon master/slave format\n");
+                pr_err("unknwon master/slave format\n");
                 return -EINVAL;
         }
 
@@ -298,7 +316,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
                 iismod |= S3C2412_IISMOD_SDF_IIS;
                 break;
         default:
-                pr_debug("Unknown data format\n");
+                pr_err("Unknown data format\n");
                 return -EINVAL;
         }
 
@@ -327,6 +345,7 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,
         iismod = readl(i2s->regs + S3C2412_IISMOD);
         pr_debug("%s: r: IISMOD: %x\n", __func__, iismod);
 
+#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S8:
                 iismod |= S3C2412_IISMOD_8BIT;
@@ -335,6 +354,25 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,
                 iismod &= ~S3C2412_IISMOD_8BIT;
                 break;
         }
+#endif
+
+#ifdef CONFIG_PLAT_S3C64XX
+        iismod &= ~0x606;
+        /* Sample size */
+        switch (params_format(params)) {
+        case SNDRV_PCM_FORMAT_S8:
+                /* 8 bit sample, 16fs BCLK */
+                iismod |= 0x2004;
+                break;
+        case SNDRV_PCM_FORMAT_S16_LE:
+                /* 16 bit sample, 32fs BCLK */
+                break;
+        case SNDRV_PCM_FORMAT_S24_LE:
+                /* 24 bit sample, 48fs BCLK */
+                iismod |= 0x4002;
+                break;
+        }
+#endif
 
         writel(iismod, i2s->regs + S3C2412_IISMOD);
         pr_debug("%s: w: IISMOD: %x\n", __func__, iismod);
@@ -489,6 +527,8 @@ int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info,
         unsigned int best_rate = 0;
         unsigned int best_deviation = INT_MAX;
 
+        pr_debug("Input clock rate %ldHz\n", clkrate);
+
         if (fstab == NULL)
                 fstab = iis_fs_tab;
 
@@ -507,7 +547,7 @@ int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info,
                 actual = clkrate / (fsdiv * div);
                 deviation = actual - rate;
 
-                printk(KERN_DEBUG "%dfs: div %d => result %d, deviation %d\n",
+                printk(KERN_DEBUG "%ufs: div %u => result %u, deviation %d\n",
                        fsdiv, div, actual, deviation);
 
                 deviation = abs(deviation);
@@ -523,7 +563,7 @@ int s3c_i2sv2_iis_calc_rate(struct s3c_i2sv2_rate_calc *info,
                         break;
         }
 
-        printk(KERN_DEBUG "best: fs=%d, div=%d, rate=%d\n",
+        printk(KERN_DEBUG "best: fs=%u, div=%u, rate=%u\n",
                best_fs, best_div, best_rate);
 
         info->fs_div = best_fs;
@@ -539,12 +579,31 @@ int s3c_i2sv2_probe(struct platform_device *pdev,
                     unsigned long base)
 {
         struct device *dev = &pdev->dev;
+        unsigned int iismod;
 
         i2s->dev = dev;
 
         /* record our i2s structure for later use in the callbacks */
         dai->private_data = i2s;
 
+        if (!base) {
+                struct resource *res = platform_get_resource(pdev,
+                                                             IORESOURCE_MEM,
+                                                             0);
+                if (!res) {
+                        dev_err(dev, "Unable to get register resource\n");
+                        return -ENXIO;
+                }
+
+                if (!request_mem_region(res->start, resource_size(res),
+                                        "s3c64xx-i2s-v4")) {
+                        dev_err(dev, "Unable to request register region\n");
+                        return -EBUSY;
+                }
+
+                base = res->start;
+        }
+
         i2s->regs = ioremap(base, 0x100);
         if (i2s->regs == NULL) {
                 dev_err(dev, "cannot ioremap registers\n");
@@ -560,12 +619,16 @@ int s3c_i2sv2_probe(struct platform_device *pdev,
 
         clk_enable(i2s->iis_pclk);
 
+        /* Mark ourselves as in TXRX mode so we can run through our cleanup
+         * process without warnings. */
+        iismod = readl(i2s->regs + S3C2412_IISMOD);
+        iismod |= S3C2412_IISMOD_MODE_TXRX;
+        writel(iismod, i2s->regs + S3C2412_IISMOD);
         s3c2412_snd_txctrl(i2s, 0);
         s3c2412_snd_rxctrl(i2s, 0);
 
         return 0;
 }
-
 EXPORT_SYMBOL_GPL(s3c_i2sv2_probe);
 
 #ifdef CONFIG_PM
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c
index b7e0b3f0bfc8..168a088ba761 100644
--- a/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/sound/soc/s3c24xx/s3c2412-i2s.c
@@ -120,7 +120,7 @@ static int s3c2412_i2s_probe(struct platform_device *pdev,
 
         s3c2412_i2s.iis_cclk = clk_get(&pdev->dev, "i2sclk");
         if (s3c2412_i2s.iis_cclk == NULL) {
-                pr_debug("failed to get i2sclk clock\n");
+                pr_err("failed to get i2sclk clock\n");
                 iounmap(s3c2412_i2s.regs);
                 return -ENODEV;
         }
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c
index 33c5de7e255f..3c06c401d0fb 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -108,48 +108,19 @@ static int s3c64xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
         return 0;
 }
 
-
-unsigned long s3c64xx_i2s_get_clockrate(struct snd_soc_dai *dai)
+struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai)
 {
         struct s3c_i2sv2_info *i2s = to_info(dai);
 
-        return clk_get_rate(i2s->iis_cclk);
+        return i2s->iis_cclk;
 }
-EXPORT_SYMBOL_GPL(s3c64xx_i2s_get_clockrate);
+EXPORT_SYMBOL_GPL(s3c64xx_i2s_get_clock);
 
 static int s3c64xx_i2s_probe(struct platform_device *pdev,
                              struct snd_soc_dai *dai)
 {
-        struct device *dev = &pdev->dev;
-        struct s3c_i2sv2_info *i2s;
-        int ret;
-
-        dev_dbg(dev, "%s: probing dai %d\n", __func__, pdev->id);
-
-        if (pdev->id < 0 || pdev->id > ARRAY_SIZE(s3c64xx_i2s)) {
-                dev_err(dev, "id %d out of range\n", pdev->id);
-                return -EINVAL;
-        }
-
-        i2s = &s3c64xx_i2s[pdev->id];
-
-        ret = s3c_i2sv2_probe(pdev, dai, i2s,
-                              pdev->id ? S3C64XX_PA_IIS1 : S3C64XX_PA_IIS0);
-        if (ret)
-                return ret;
-
-        i2s->dma_capture = &s3c64xx_i2s_pcm_stereo_in[pdev->id];
-        i2s->dma_playback = &s3c64xx_i2s_pcm_stereo_out[pdev->id];
-
-        i2s->iis_cclk = clk_get(dev, "audio-bus");
-        if (IS_ERR(i2s->iis_cclk)) {
-                dev_err(dev, "failed to get audio-bus");
-                iounmap(i2s->regs);
-                return -ENODEV;
-        }
-
         /* configure GPIO for i2s port */
-        switch (pdev->id) {
+        switch (dai->id) {
         case 0:
                 s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C64XX_GPD0_I2S0_CLK);
                 s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C64XX_GPD1_I2S0_CDCLK);
@@ -175,41 +146,122 @@ static int s3c64xx_i2s_probe(struct platform_device *pdev,
         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_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,       
 };
 
-struct snd_soc_dai s3c64xx_i2s_dai = {
-        .name           = "s3c64xx-i2s",
-        .id             = 0,
-        .probe          = s3c64xx_i2s_probe,
-        .playback = {
-                .channels_min   = 2,
-                .channels_max   = 2,
-                .rates          = S3C64XX_I2S_RATES,
-                .formats        = S3C64XX_I2S_FMTS,
+struct snd_soc_dai s3c64xx_i2s_dai[] = {
+        {
+                .name           = "s3c64xx-i2s",
+                .id             = 0,
+                .probe          = s3c64xx_i2s_probe,
+                .playback = {
+                        .channels_min   = 2,
+                        .channels_max   = 2,
+                        .rates          = S3C64XX_I2S_RATES,
+                        .formats        = S3C64XX_I2S_FMTS,
+                },
+                .capture = {
+                         .channels_min  = 2,
+                         .channels_max  = 2,
+                         .rates         = S3C64XX_I2S_RATES,
+                         .formats       = S3C64XX_I2S_FMTS,
+                 },
+                .ops = &s3c64xx_i2s_dai_ops,
+                .symmetric_rates = 1,
         },
-        .capture = {
-                .channels_min   = 2,
-                .channels_max   = 2,
-                .rates          = S3C64XX_I2S_RATES,
-                .formats        = S3C64XX_I2S_FMTS,
+        {
+                .name           = "s3c64xx-i2s",
+                .id             = 1,
+                .probe          = s3c64xx_i2s_probe,
+                .playback = {
+                        .channels_min   = 2,
+                        .channels_max   = 2,
+                        .rates          = S3C64XX_I2S_RATES,
+                        .formats        = S3C64XX_I2S_FMTS,
+                },
+                .capture = {
+                         .channels_min  = 2,
+                         .channels_max  = 2,
+                         .rates         = S3C64XX_I2S_RATES,
+                         .formats       = S3C64XX_I2S_FMTS,
+                 },
+                .ops = &s3c64xx_i2s_dai_ops,
+                .symmetric_rates = 1,
         },
-        .ops = &s3c64xx_i2s_dai_ops,
 };
 EXPORT_SYMBOL_GPL(s3c64xx_i2s_dai);
 
+static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev)
+{
+        struct s3c_i2sv2_info *i2s;
+        struct snd_soc_dai *dai;
+        int ret;
+
+        if (pdev->id >= ARRAY_SIZE(s3c64xx_i2s)) {
+                dev_err(&pdev->dev, "id %d out of range\n", pdev->id);
+                return -EINVAL;
+        }
+
+        i2s = &s3c64xx_i2s[pdev->id];
+        dai = &s3c64xx_i2s_dai[pdev->id];
+        dai->dev = &pdev->dev;
+
+        i2s->dma_capture = &s3c64xx_i2s_pcm_stereo_in[pdev->id];
+        i2s->dma_playback = &s3c64xx_i2s_pcm_stereo_out[pdev->id];
+
+        i2s->iis_cclk = clk_get(&pdev->dev, "audio-bus");
+        if (IS_ERR(i2s->iis_cclk)) {
+                dev_err(&pdev->dev, "failed to get audio-bus\n");
+                ret = PTR_ERR(i2s->iis_cclk);
+                goto err;
+        }
+
+        ret = s3c_i2sv2_probe(pdev, dai, i2s, 0);
+        if (ret)
+                goto err_clk;
+
+        ret = s3c_i2sv2_register_dai(dai);
+        if (ret != 0)
+                goto err_i2sv2;
+
+        return 0;
+
+err_i2sv2:
+        /* Not implemented for I2Sv2 core yet */
+err_clk:
+        clk_put(i2s->iis_cclk);
+err:
+        return ret;
+}
+
+static __devexit int s3c64xx_iis_dev_remove(struct platform_device *pdev)
+{
+        dev_err(&pdev->dev, "Device removal not yet supported\n");
+        return 0;
+}
+
+static struct platform_driver s3c64xx_iis_driver = {
+        .probe  = s3c64xx_iis_dev_probe,
+        .remove = s3c64xx_iis_dev_remove,
+        .driver = {
+                .name = "s3c64xx-iis",
+                .owner = THIS_MODULE,
+        },
+};
+
 static int __init s3c64xx_i2s_init(void)
 {
-        return  s3c_i2sv2_register_dai(&s3c64xx_i2s_dai);
+        return platform_driver_register(&s3c64xx_iis_driver);
 }
 module_init(s3c64xx_i2s_init);
 
 static void __exit s3c64xx_i2s_exit(void)
 {
-        snd_soc_unregister_dai(&s3c64xx_i2s_dai);
+        platform_driver_unregister(&s3c64xx_iis_driver);
 }
 module_exit(s3c64xx_i2s_exit);
 
@@ -217,6 +269,3 @@ module_exit(s3c64xx_i2s_exit);
 MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
 MODULE_DESCRIPTION("S3C64XX I2S SoC Interface");
 MODULE_LICENSE("GPL");
-
-
-
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.h b/sound/soc/s3c24xx/s3c64xx-i2s.h
index b7ffe3c38b66..02148cee2613 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.h
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.h
@@ -15,6 +15,8 @@
 #ifndef __SND_SOC_S3C24XX_S3C64XX_I2S_H
 #define __SND_SOC_S3C24XX_S3C64XX_I2S_H __FILE__
 
+struct clk;
+
 #include "s3c-i2s-v2.h"
 
 #define S3C64XX_DIV_BCLK        S3C_I2SV2_DIV_BCLK
@@ -24,8 +26,8 @@
 #define S3C64XX_CLKSRC_PCLK     (0)
 #define S3C64XX_CLKSRC_MUX      (1)
 
-extern struct snd_soc_dai s3c64xx_i2s_dai;
+extern struct snd_soc_dai s3c64xx_i2s_dai[];
 
-extern unsigned long s3c64xx_i2s_get_clockrate(struct snd_soc_dai *cpu_dai);
+extern struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai);
 
 #endif /* __SND_SOC_S3C24XX_S3C64XX_I2S_H */