Merge tag 'pwm/for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[firefly-linux-kernel-4.4.55.git] / sound / soc / ux500 / ux500_msp_dai.c

diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index c6fb5cce980e365f4fa84a02fa2b4254a9887e66..5f4807b2c0072b00b29619fb4d224e475ddfab3f 100644 (file)
--- 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);