diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 16:20:30 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 16:20:30 (GMT) |
| commit | 458bcee95d9ff742dcb379f6605a4023848ed8cb (patch) | |
| tree | 1ac46e360f79c77b4dda692ad1110076d909e3bd /sound/soc/ux500/ux500_msp_dai.c | |
| parent | 93d4c1e04f9a316decc2d0fca3ce3a8e9722a155 (diff) | |
| parent | eef6473ff3ce2383febebd2e799beceaece9adda (diff) | |
| download | linux-458bcee95d9ff742dcb379f6605a4023848ed8cb.tar.xz | |
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
Diffstat (limited to 'sound/soc/ux500/ux500_msp_dai.c')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 7d5fc13..c6fb5cc 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -658,14 +658,11 @@ static int ux500_msp_dai_probe(struct snd_soc_dai *dai) { struct ux500_msp_i2s_drvdata *drvdata = dev_get_drvdata(dai->dev); - drvdata->playback_dma_data.dma_cfg = drvdata->msp->dma_cfg_tx; - drvdata->capture_dma_data.dma_cfg = drvdata->msp->dma_cfg_rx; + dai->playback_dma_data = &drvdata->msp->playback_dma_data; + dai->capture_dma_data = &drvdata->msp->capture_dma_data; - dai->playback_dma_data = &drvdata->playback_dma_data; - dai->capture_dma_data = &drvdata->capture_dma_data; - - drvdata->playback_dma_data.data_size = drvdata->slot_width; - drvdata->capture_dma_data.data_size = drvdata->slot_width; + drvdata->msp->playback_dma_data.data_size = drvdata->slot_width; + drvdata->msp->capture_dma_data.data_size = drvdata->slot_width; return 0; } |