ASoC: OMAP: mcbsp, mcpdm, dmic, hdmi: Set dma_data at startup time

Set the dma_data for the stream (snd_soc_dai_set_dma_data) at dai_startup
time so omap-pcm will have access to the needed information regarding to
the DMA channel earlier.
This is needed for the clean dmaengine support.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 9 insertions, 6 deletions

diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index 095176738fd6..f59c69fb400e 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -67,6 +67,9 @@ static int omap_hdmi_dai_startup(struct snd_pcm_substream *substream,
                 dev_err(dai->dev, "audio not supported\n");
                 return -ENODEV;
         }
+
+        snd_soc_dai_set_dma_data(dai, substream, &priv->dma_params);
+
         return 0;
 }
 
@@ -85,24 +88,24 @@ static int omap_hdmi_dai_hw_params(struct snd_pcm_substream *substream,
         struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai);
         struct snd_aes_iec958 *iec = &priv->iec;
         struct snd_cea_861_aud_if *cea = &priv->cea;
+        struct omap_pcm_dma_data *dma_data;
         int err = 0;
 
+        dma_data = snd_soc_dai_get_dma_data(dai, substream);
+
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
-                priv->dma_params.packet_size = 16;
+                dma_data->packet_size = 16;
                 break;
         case SNDRV_PCM_FORMAT_S24_LE:
-                priv->dma_params.packet_size = 32;
+                dma_data->packet_size = 32;
                 break;
         default:
                 dev_err(dai->dev, "format not supported!\n");
                 return -EINVAL;
         }
 
-        priv->dma_params.data_type = 32;
-
-        snd_soc_dai_set_dma_data(dai, substream,
-                                 &priv->dma_params);
+        dma_data->data_type = 32;
 
         /*
          * fill the IEC-60958 channel status word