diff options
| author | Eric Millbrandt <emillbrandt@dekaresearch.com> | 2012-09-13 23:43:11 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-19 05:03:42 +0200 |
| commit | f515b67381de0a4a28d639e0f1bb587a3a49f0d2 (patch) | |
| tree | 6ad9f4317a532ed4e06dc2efdffedae2a28c37f9 /sound/soc/fsl/mpc5200_psc_i2s.c | |
| parent | ASoC: imx-audmux: remove null check of audmux_base in audmux_read_file (diff) | |
| download | linux-f515b67381de0a4a28d639e0f1bb587a3a49f0d2.tar.xz linux-f515b67381de0a4a28d639e0f1bb587a3a49f0d2.zip | |
ASoC: fsl: mpc5200 combine psc_dma platform data
The mpc5200_psc_ac97 and mpc5200_psc_i2s modules rely on shared platform data
with mpc5200_dma.
Signed-off-by: Eric Millbrandt <emillbrandt@dekaresearch.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl/mpc5200_psc_i2s.c')
| -rw-r--r-- | sound/soc/fsl/mpc5200_psc_i2s.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index 7b530327553a..c0b7a23ebbfd 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c @@ -156,6 +156,10 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op) struct psc_dma *psc_dma; struct mpc52xx_psc __iomem *regs; + rc = mpc5200_audio_dma_create(op); + if (rc != 0) + return rc; + rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); if (rc != 0) { pr_err("Failed to register DAI\n"); @@ -200,6 +204,7 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op) static int __devexit psc_i2s_of_remove(struct platform_device *op) { + mpc5200_audio_dma_destroy(op); snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_i2s_dai)); return 0; } |