5 files changed, 137 insertions, 134 deletions

diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c
index 178d1bad6259..b3b66aa98dce 100644
--- a/sound/soc/ux500/mop500.c
+++ b/sound/soc/ux500/mop500.c
@@ -91,6 +91,8 @@ static int mop500_of_probe(struct platform_device *pdev,
         for (i = 0; i < 2; i++) {
                 mop500_dai_links[i].cpu_of_node = msp_np[i];
                 mop500_dai_links[i].cpu_dai_name = NULL;
+                mop500_dai_links[i].platform_of_node = msp_np[i];
+                mop500_dai_links[i].platform_name = NULL;
                 mop500_dai_links[i].codec_of_node = codec_np;
                 mop500_dai_links[i].codec_name = NULL;
         }
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index c6fb5cce980e..5f4807b2c007 100644
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -17,12 +17,14 @@
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/of.h>
 #include <linux/regulator/consumer.h>
 #include <linux/mfd/dbx500-prcmu.h>
 #include <linux/platform_data/asoc-ux500-msp.h>
 
 #include <sound/soc.h>
 #include <sound/soc-dai.h>
+#include <sound/dmaengine_pcm.h>
 
 #include "ux500_msp_i2s.h"
 #include "ux500_msp_dai.h"
@@ -654,16 +656,52 @@ static int ux500_msp_dai_trigger(struct snd_pcm_substream *substream,
         return ret;
 }
 
+static int ux500_msp_dai_of_probe(struct snd_soc_dai *dai)
+{
+        struct ux500_msp_i2s_drvdata *drvdata = dev_get_drvdata(dai->dev);
+        struct snd_dmaengine_dai_dma_data *playback_dma_data;
+        struct snd_dmaengine_dai_dma_data *capture_dma_data;
+
+        playback_dma_data = devm_kzalloc(dai->dev,
+                                         sizeof(*playback_dma_data),
+                                         GFP_KERNEL);
+        if (!playback_dma_data)
+                return -ENOMEM;
+
+        capture_dma_data = devm_kzalloc(dai->dev,
+                                        sizeof(*capture_dma_data),
+                                        GFP_KERNEL);
+        if (!capture_dma_data)
+                return -ENOMEM;
+
+        playback_dma_data->addr = drvdata->msp->playback_dma_data.tx_rx_addr;
+        capture_dma_data->addr = drvdata->msp->capture_dma_data.tx_rx_addr;
+
+        playback_dma_data->maxburst = 4;
+        capture_dma_data->maxburst = 4;
+
+        snd_soc_dai_init_dma_data(dai, playback_dma_data, capture_dma_data);
+
+        return 0;
+}
+
 static int ux500_msp_dai_probe(struct snd_soc_dai *dai)
 {
         struct ux500_msp_i2s_drvdata *drvdata = dev_get_drvdata(dai->dev);
+        struct msp_i2s_platform_data *pdata = dai->dev->platform_data;
+        int ret;
 
-        dai->playback_dma_data = &drvdata->msp->playback_dma_data;
-        dai->capture_dma_data = &drvdata->msp->capture_dma_data;
+        if (!pdata) {
+                ret = ux500_msp_dai_of_probe(dai);
+                return ret;
+        }
 
         drvdata->msp->playback_dma_data.data_size = drvdata->slot_width;
         drvdata->msp->capture_dma_data.data_size = drvdata->slot_width;
 
+        snd_soc_dai_init_dma_data(dai,
+                                  &drvdata->msp->playback_dma_data,
+                                  &drvdata->msp->capture_dma_data);
         return 0;
 }
 
@@ -680,87 +718,19 @@ static struct snd_soc_dai_ops ux500_msp_dai_ops[] = {
         }
 };
 
-static struct snd_soc_dai_driver ux500_msp_dai_drv[UX500_NBR_OF_DAI] = {
-        {
-                .name = "ux500-msp-i2s.0",
-                .probe = ux500_msp_dai_probe,
-                .id = 0,
-                .suspend = NULL,
-                .resume = NULL,
-                .playback = {
-                        .channels_min = UX500_MSP_MIN_CHANNELS,
-                        .channels_max = UX500_MSP_MAX_CHANNELS,
-                        .rates = UX500_I2S_RATES,
-                        .formats = UX500_I2S_FORMATS,
-                },
-                .capture = {
-                        .channels_min = UX500_MSP_MIN_CHANNELS,
-                        .channels_max = UX500_MSP_MAX_CHANNELS,
-                        .rates = UX500_I2S_RATES,
-                        .formats = UX500_I2S_FORMATS,
-                },
-                .ops = ux500_msp_dai_ops,
-        },
-        {
-                .name = "ux500-msp-i2s.1",
-                .probe = ux500_msp_dai_probe,
-                .id = 1,
-                .suspend = NULL,
-                .resume = NULL,
-                .playback = {
-                        .channels_min = UX500_MSP_MIN_CHANNELS,
-                        .channels_max = UX500_MSP_MAX_CHANNELS,
-                        .rates = UX500_I2S_RATES,
-                        .formats = UX500_I2S_FORMATS,
-                },
-                .capture = {
-                        .channels_min = UX500_MSP_MIN_CHANNELS,
-                        .channels_max = UX500_MSP_MAX_CHANNELS,
-                        .rates = UX500_I2S_RATES,
-                        .formats = UX500_I2S_FORMATS,
-                },
-                .ops = ux500_msp_dai_ops,
-        },
-        {
-                .name = "ux500-msp-i2s.2",
-                .id = 2,
-                .probe = ux500_msp_dai_probe,
-                .suspend = NULL,
-                .resume = NULL,
-                .playback = {
-                        .channels_min = UX500_MSP_MIN_CHANNELS,
-                        .channels_max = UX500_MSP_MAX_CHANNELS,
-                        .rates = UX500_I2S_RATES,
-                        .formats = UX500_I2S_FORMATS,
-                },
-                .capture = {
-                        .channels_min = UX500_MSP_MIN_CHANNELS,
-                        .channels_max = UX500_MSP_MAX_CHANNELS,
-                        .rates = UX500_I2S_RATES,
-                        .formats = UX500_I2S_FORMATS,
-                },
-                .ops = ux500_msp_dai_ops,
-        },
-        {
-                .name = "ux500-msp-i2s.3",
-                .probe = ux500_msp_dai_probe,
-                .id = 3,
-                .suspend = NULL,
-                .resume = NULL,
-                .playback = {
-                        .channels_min = UX500_MSP_MIN_CHANNELS,
-                        .channels_max = UX500_MSP_MAX_CHANNELS,
-                        .rates = UX500_I2S_RATES,
-                        .formats = UX500_I2S_FORMATS,
-                },
-                .capture = {
-                        .channels_min = UX500_MSP_MIN_CHANNELS,
-                        .channels_max = UX500_MSP_MAX_CHANNELS,
-                        .rates = UX500_I2S_RATES,
-                        .formats = UX500_I2S_FORMATS,
-                },
-                .ops = ux500_msp_dai_ops,
-        },
+static struct snd_soc_dai_driver ux500_msp_dai_drv = {
+        .probe                 = ux500_msp_dai_probe,
+        .suspend               = NULL,
+        .resume                = NULL,
+        .playback.channels_min = UX500_MSP_MIN_CHANNELS,
+        .playback.channels_max = UX500_MSP_MAX_CHANNELS,
+        .playback.rates        = UX500_I2S_RATES,
+        .playback.formats      = UX500_I2S_FORMATS,
+        .capture.channels_min  = UX500_MSP_MIN_CHANNELS,
+        .capture.channels_max  = UX500_MSP_MAX_CHANNELS,
+        .capture.rates         = UX500_I2S_RATES,
+        .capture.formats       = UX500_I2S_FORMATS,
+        .ops                   = ux500_msp_dai_ops,
 };
 
 static const struct snd_soc_component_driver ux500_msp_component = {
@@ -771,10 +741,14 @@ static const struct snd_soc_component_driver ux500_msp_component = {
 static int ux500_msp_drv_probe(struct platform_device *pdev)
 {
         struct ux500_msp_i2s_drvdata *drvdata;
+        struct msp_i2s_platform_data *pdata = pdev->dev.platform_data;
+        struct device_node *np = pdev->dev.of_node;
         int ret = 0;
 
-        dev_dbg(&pdev->dev, "%s: Enter (pdev->name = %s).\n", __func__,
-                pdev->name);
+        if (!pdata && !np) {
+                dev_err(&pdev->dev, "No platform data or Device Tree found\n");
+                return -ENODEV;
+        }
 
         drvdata = devm_kzalloc(&pdev->dev,
                                 sizeof(struct ux500_msp_i2s_drvdata),
@@ -826,7 +800,7 @@ static int ux500_msp_drv_probe(struct platform_device *pdev)
         dev_set_drvdata(&pdev->dev, drvdata);
 
         ret = snd_soc_register_component(&pdev->dev, &ux500_msp_component,
-                                         &ux500_msp_dai_drv[drvdata->msp->id], 1);
+                                         &ux500_msp_dai_drv, 1);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Error: %s: Failed to register MSP%d!\n",
                         __func__, drvdata->msp->id);
diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index 1ca8b08ae993..959d7b4edf56 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -646,6 +646,34 @@ int ux500_msp_i2s_close(struct ux500_msp *msp, unsigned int dir)
 
 }
 
+static int ux500_msp_i2s_of_init_msp(struct platform_device *pdev,
+                                struct ux500_msp *msp,
+                                struct msp_i2s_platform_data **platform_data)
+{
+        struct msp_i2s_platform_data *pdata;
+
+        *platform_data = devm_kzalloc(&pdev->dev,
+                                     sizeof(struct msp_i2s_platform_data),
+                                     GFP_KERNEL);
+        pdata = *platform_data;
+        if (!pdata)
+                return -ENOMEM;
+
+        msp->playback_dma_data.dma_cfg = devm_kzalloc(&pdev->dev,
+                                        sizeof(struct stedma40_chan_cfg),
+                                        GFP_KERNEL);
+        if (!msp->playback_dma_data.dma_cfg)
+                return -ENOMEM;
+
+        msp->capture_dma_data.dma_cfg = devm_kzalloc(&pdev->dev,
+                                        sizeof(struct stedma40_chan_cfg),
+                                        GFP_KERNEL);
+        if (!msp->capture_dma_data.dma_cfg)
+                return -ENOMEM;
+
+        return 0;
+}
+
 int ux500_msp_i2s_init_msp(struct platform_device *pdev,
                         struct ux500_msp **msp_p,
                         struct msp_i2s_platform_data *platform_data)
@@ -653,30 +681,28 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev,
         struct resource *res = NULL;
         struct device_node *np = pdev->dev.of_node;
         struct ux500_msp *msp;
+        int ret;
 
         *msp_p = devm_kzalloc(&pdev->dev, sizeof(struct ux500_msp), GFP_KERNEL);
         msp = *msp_p;
         if (!msp)
                 return -ENOMEM;
 
-        if (np) {
-                if (!platform_data) {
-                        platform_data = devm_kzalloc(&pdev->dev,
-                                sizeof(struct msp_i2s_platform_data), GFP_KERNEL);
-                        if (!platform_data)
-                                return -ENOMEM;
-                }
-        } else
-                if (!platform_data)
+        if (!platform_data) {
+                if (np) {
+                        ret = ux500_msp_i2s_of_init_msp(pdev, msp,
+                                                        &platform_data);
+                        if (ret)
+                                return ret;
+                } else
                         return -EINVAL;
+        } else {
+                msp->playback_dma_data.dma_cfg = platform_data->msp_i2s_dma_tx;
+                msp->capture_dma_data.dma_cfg = platform_data->msp_i2s_dma_rx;
+                msp->id = platform_data->id;
+        }
 
-        dev_dbg(&pdev->dev, "%s: Enter (name: %s, id: %d).\n", __func__,
-                pdev->name, platform_data->id);
-
-        msp->id = platform_data->id;
         msp->dev = &pdev->dev;
-        msp->playback_dma_data.dma_cfg = platform_data->msp_i2s_dma_tx;
-        msp->capture_dma_data.dma_cfg = platform_data->msp_i2s_dma_rx;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h
index 258d0bcee0bd..875de0f68b85 100644
--- a/sound/soc/ux500/ux500_msp_i2s.h
+++ b/sound/soc/ux500/ux500_msp_i2s.h
@@ -475,7 +475,7 @@ struct ux500_msp_dma_params {
 };
 
 struct ux500_msp {
-        enum msp_i2s_id id;
+        int id;
         void __iomem *registers;
         struct device *dev;
         struct ux500_msp_dma_params playback_dma_data;
diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c
index ce554de5d9dc..51a66a87305a 100644
--- a/sound/soc/ux500/ux500_pcm.c
+++ b/sound/soc/ux500/ux500_pcm.c
@@ -28,12 +28,6 @@
 #include "ux500_msp_i2s.h"
 #include "ux500_pcm.h"
 
-#define UX500_PLATFORM_MIN_RATE 8000
-#define UX500_PLATFORM_MAX_RATE 48000
-
-#define UX500_PLATFORM_MIN_CHANNELS 1
-#define UX500_PLATFORM_MAX_CHANNELS 8
-
 #define UX500_PLATFORM_PERIODS_BYTES_MIN        128
 #define UX500_PLATFORM_PERIODS_BYTES_MAX        (64 * PAGE_SIZE)
 #define UX500_PLATFORM_PERIODS_MIN              2
@@ -45,15 +39,6 @@ static const struct snd_pcm_hardware ux500_pcm_hw = {
                 SNDRV_PCM_INFO_MMAP |
                 SNDRV_PCM_INFO_RESUME |
                 SNDRV_PCM_INFO_PAUSE,
-        .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                SNDRV_PCM_FMTBIT_U16_LE |
-                SNDRV_PCM_FMTBIT_S16_BE |
-                SNDRV_PCM_FMTBIT_U16_BE,
-        .rates = SNDRV_PCM_RATE_KNOT,
-        .rate_min = UX500_PLATFORM_MIN_RATE,
-        .rate_max = UX500_PLATFORM_MAX_RATE,
-        .channels_min = UX500_PLATFORM_MIN_CHANNELS,
-        .channels_max = UX500_PLATFORM_MAX_CHANNELS,
         .buffer_bytes_max = UX500_PLATFORM_BUFFER_BYTES_MAX,
         .period_bytes_min = UX500_PLATFORM_PERIODS_BYTES_MIN,
         .period_bytes_max = UX500_PLATFORM_PERIODS_BYTES_MAX,
@@ -65,14 +50,10 @@ static struct dma_chan *ux500_pcm_request_chan(struct snd_soc_pcm_runtime *rtd,
         struct snd_pcm_substream *substream)
 {
         struct snd_soc_dai *dai = rtd->cpu_dai;
-        struct device *dev = dai->dev;
         u16 per_data_width, mem_data_width;
         struct stedma40_chan_cfg *dma_cfg;
         struct ux500_msp_dma_params *dma_params;
 
-        dev_dbg(dev, "%s: MSP %d (%s): Enter.\n", __func__, dai->id,
-                snd_pcm_stream_str(substream));
-
         dma_params = snd_soc_dai_get_dma_data(dai, substream);
         dma_cfg = dma_params->dma_cfg;
 
@@ -108,26 +89,36 @@ static int ux500_pcm_prepare_slave_config(struct snd_pcm_substream *substream,
                 struct dma_slave_config *slave_config)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct ux500_msp_dma_params *dma_params;
-        struct stedma40_chan_cfg *dma_cfg;
+        struct msp_i2s_platform_data *pdata = rtd->cpu_dai->dev->platform_data;
+        struct snd_dmaengine_dai_dma_data *snd_dma_params;
+        struct ux500_msp_dma_params *ste_dma_params;
+        dma_addr_t dma_addr;
         int ret;
 
-        dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-        dma_cfg = dma_params->dma_cfg;
+        if (pdata) {
+                ste_dma_params =
+                        snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+                dma_addr = ste_dma_params->tx_rx_addr;
+        } else {
+                snd_dma_params =
+                        snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+                dma_addr = snd_dma_params->addr;
+        }
 
         ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config);
         if (ret)
                 return ret;
 
         slave_config->dst_maxburst = 4;
-        slave_config->dst_addr_width = dma_cfg->dst_info.data_width;
         slave_config->src_maxburst = 4;
-        slave_config->src_addr_width = dma_cfg->src_info.data_width;
+
+        slave_config->src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+        slave_config->dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                slave_config->dst_addr = dma_params->tx_rx_addr;
+                slave_config->dst_addr = dma_addr;
         else
-                slave_config->src_addr = dma_params->tx_rx_addr;
+                slave_config->src_addr = dma_addr;
 
         return 0;
 }
@@ -139,15 +130,25 @@ static const struct snd_dmaengine_pcm_config ux500_dmaengine_pcm_config = {
         .prepare_slave_config = ux500_pcm_prepare_slave_config,
 };
 
+static const struct snd_dmaengine_pcm_config ux500_dmaengine_of_pcm_config = {
+        .compat_request_channel = ux500_pcm_request_chan,
+        .prepare_slave_config = ux500_pcm_prepare_slave_config,
+};
+
 int ux500_pcm_register_platform(struct platform_device *pdev)
 {
+        const struct snd_dmaengine_pcm_config *pcm_config;
+        struct device_node *np = pdev->dev.of_node;
         int ret;
 
-        ret = snd_dmaengine_pcm_register(&pdev->dev,
-                        &ux500_dmaengine_pcm_config,
-                        SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
-                        SND_DMAENGINE_PCM_FLAG_COMPAT |
-                        SND_DMAENGINE_PCM_FLAG_NO_DT);
+        if (np)
+                pcm_config = &ux500_dmaengine_of_pcm_config;
+        else
+                pcm_config = &ux500_dmaengine_pcm_config;
+
+        ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config,
+                                         SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
+                                         SND_DMAENGINE_PCM_FLAG_COMPAT);
         if (ret < 0) {
                 dev_err(&pdev->dev,
                         "%s: ERROR: Failed to register platform '%s' (%d)!\n",