1 files changed, 129 insertions, 77 deletions

diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c
index 1d85cb85a7d2..ae7acb6c4f1d 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -12,15 +12,15 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 
 #include <sound/soc.h>
 
-#include <mach/gpio-bank-d.h>
-#include <mach/gpio-bank-e.h>
-#include <plat/gpio-cfg.h>
+#include <plat/audio.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
@@ -46,45 +46,107 @@ static struct s3c_dma_params s3c64xx_i2s_pcm_stereo_out[MAX_I2SV3];
 static struct s3c_dma_params s3c64xx_i2s_pcm_stereo_in[MAX_I2SV3];
 static struct s3c_i2sv2_info s3c64xx_i2s[MAX_I2SV3];
 
-struct snd_soc_dai s3c64xx_i2s_dai[MAX_I2SV3];
-EXPORT_SYMBOL_GPL(s3c64xx_i2s_dai);
-
-static inline struct s3c_i2sv2_info *to_info(struct snd_soc_dai *cpu_dai)
+struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai)
 {
-        return cpu_dai->private_data;
+        struct s3c_i2sv2_info *i2s = snd_soc_dai_get_drvdata(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(s3c64xx_i2s_get_clock);
 
-static int s3c64xx_i2s_probe(struct platform_device *pdev,
-                             struct snd_soc_dai *dai)
+static int s3c64xx_i2s_probe(struct snd_soc_dai *dai)
 {
-        /* configure GPIO for i2s port */
-        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);
-                s3c_gpio_cfgpin(S3C64XX_GPD(2), S3C64XX_GPD2_I2S0_LRCLK);
-                s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C64XX_GPD3_I2S0_DI);
-                s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C64XX_GPD4_I2S0_D0);
-                break;
-        case 1:
-                s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C64XX_GPE0_I2S1_CLK);
-                s3c_gpio_cfgpin(S3C64XX_GPE(1), S3C64XX_GPE1_I2S1_CDCLK);
-                s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_I2S1_LRCLK);
-                s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI);
-                s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0);
+        struct s3c_i2sv2_info *i2s;
+        int ret;
+
+        if (dai->id >= MAX_I2SV3) {
+                dev_err(dai->dev, "id %d out of range\n", dai->id);
+                return -EINVAL;
+        }
+
+        i2s = &s3c64xx_i2s[dai->id];
+        snd_soc_dai_set_drvdata(dai, i2s);
+
+        i2s->iis_cclk = clk_get(dai->dev, "audio-bus");
+        if (IS_ERR(i2s->iis_cclk)) {
+                dev_err(dai->dev, "failed to get audio-bus\n");
+                ret = PTR_ERR(i2s->iis_cclk);
+                goto err;
         }
 
+        clk_enable(i2s->iis_cclk);
+
+        ret = s3c_i2sv2_probe(dai, i2s, i2s->base);
+        if (ret)
+                goto err_clk;
+
         return 0;
+
+err_clk:
+        clk_disable(i2s->iis_cclk);
+        clk_put(i2s->iis_cclk);
+err:
+        kfree(i2s);
+        return ret;
 }
 
+static int s3c64xx_i2s_remove(struct snd_soc_dai *dai)
+{
+        struct s3c_i2sv2_info *i2s = snd_soc_dai_get_drvdata(dai);
+
+        clk_disable(i2s->iis_cclk);
+        clk_put(i2s->iis_cclk);
+        kfree(i2s);
+        return 0;
+}
 
 static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops;
 
+static struct snd_soc_dai_driver s3c64xx_i2s_dai[MAX_I2SV3] = {
+{
+        .name = "s3c64xx-i2s-0",
+        .probe = s3c64xx_i2s_probe,
+        .remove = s3c64xx_i2s_remove,
+        .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,
+}, {
+        .name = "s3c64xx-i2s-1",
+        .probe = s3c64xx_i2s_probe,
+        .remove = s3c64xx_i2s_remove,
+        .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,
+},};
+
 static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev)
 {
+        struct s3c_audio_pdata *i2s_pdata;
         struct s3c_i2sv2_info *i2s;
-        struct snd_soc_dai *dai;
-        int ret;
+        struct resource *res;
+        int i, ret;
 
         if (pdev->id >= MAX_I2SV3) {
                 dev_err(&pdev->dev, "id %d out of range\n", pdev->id);
@@ -92,74 +154,63 @@ static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev)
         }
 
         i2s = &s3c64xx_i2s[pdev->id];
-        dai = &s3c64xx_i2s_dai[pdev->id];
-        dai->dev = &pdev->dev;
-        dai->name = "s3c64xx-i2s";
-        dai->id = pdev->id;
-        dai->symmetric_rates = 1;
-        dai->playback.channels_min = 2;
-        dai->playback.channels_max = 2;
-        dai->playback.rates = S3C64XX_I2S_RATES;
-        dai->playback.formats = S3C64XX_I2S_FMTS;
-        dai->capture.channels_min = 2;
-        dai->capture.channels_max = 2;
-        dai->capture.rates = S3C64XX_I2S_RATES;
-        dai->capture.formats = S3C64XX_I2S_FMTS;
-        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];
 
-        if (pdev->id == 0) {
-                i2s->dma_capture->channel = DMACH_I2S0_IN;
-                i2s->dma_capture->dma_addr = S3C64XX_PA_IIS0 + S3C2412_IISRXD;
-                i2s->dma_playback->channel = DMACH_I2S0_OUT;
-                i2s->dma_playback->dma_addr = S3C64XX_PA_IIS0 + S3C2412_IISTXD;
-        } else {
-                i2s->dma_capture->channel = DMACH_I2S1_IN;
-                i2s->dma_capture->dma_addr = S3C64XX_PA_IIS1 + S3C2412_IISRXD;
-                i2s->dma_playback->channel = DMACH_I2S1_OUT;
-                i2s->dma_playback->dma_addr = S3C64XX_PA_IIS1 + S3C2412_IISTXD;
+        res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "Unable to get I2S-TX dma resource\n");
+                return -ENXIO;
+        }
+        i2s->dma_playback->channel = res->start;
+
+        res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+        if (!res) {
+                dev_err(&pdev->dev, "Unable to get I2S-RX dma resource\n");
+                return -ENXIO;
+        }
+        i2s->dma_capture->channel = res->start;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "Unable to get I2S SFR address\n");
+                return -ENXIO;
         }
 
+        if (!request_mem_region(res->start, resource_size(res),
+                                "s3c64xx-i2s")) {
+                dev_err(&pdev->dev, "Unable to request SFR region\n");
+                return -EBUSY;
+        }
+        i2s->base = res->start;
+
+        i2s_pdata = pdev->dev.platform_data;
+        if (i2s_pdata && i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) {
+                dev_err(&pdev->dev, "Unable to configure gpio\n");
+                return -EINVAL;
+        }
+        i2s->dma_capture->dma_addr = res->start + S3C2412_IISRXD;
+        i2s->dma_playback->dma_addr = res->start + S3C2412_IISTXD;
+
         i2s->dma_capture->client = &s3c64xx_dma_client_in;
         i2s->dma_capture->dma_size = 4;
         i2s->dma_playback->client = &s3c64xx_dma_client_out;
         i2s->dma_playback->dma_size = 4;
 
-        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;
+        for (i = 0; i < ARRAY_SIZE(s3c64xx_i2s_dai); i++) {
+                ret = s3c_i2sv2_register_dai(&pdev->dev, i,
+                                                &s3c64xx_i2s_dai[i]);
+                if (ret != 0)
+                        return ret;
         }
 
-        clk_enable(i2s->iis_cclk);
-
-        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");
+        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c64xx_i2s_dai));
         return 0;
 }
 
@@ -188,3 +239,4 @@ module_exit(s3c64xx_i2s_exit);
 MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
 MODULE_DESCRIPTION("S3C64XX I2S SoC Interface");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:s3c64xx-iis");