diff options
author | Eric Millbrandt <emillbrandt@dekaresearch.com> | 2012-09-13 17:43:11 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-18 23:03:42 -0400 |
commit | f515b67381de0a4a28d639e0f1bb587a3a49f0d2 (patch) | |
tree | 6ad9f4317a532ed4e06dc2efdffedae2a28c37f9 /sound/soc/fsl/mpc5200_psc_ac97.c | |
parent | f3a50c95e275c2e553e2a6dcc646eef3daf98a3e (diff) |
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_ac97.c')
-rw-r--r-- | sound/soc/fsl/mpc5200_psc_ac97.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index ffa00a2eb770..9a094535fb26 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c | |||
@@ -278,6 +278,10 @@ static int __devinit psc_ac97_of_probe(struct platform_device *op) | |||
278 | struct snd_ac97 ac97; | 278 | struct snd_ac97 ac97; |
279 | struct mpc52xx_psc __iomem *regs; | 279 | struct mpc52xx_psc __iomem *regs; |
280 | 280 | ||
281 | rc = mpc5200_audio_dma_create(op); | ||
282 | if (rc != 0) | ||
283 | return rc; | ||
284 | |||
281 | rc = snd_soc_register_dais(&op->dev, psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai)); | 285 | rc = snd_soc_register_dais(&op->dev, psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai)); |
282 | if (rc != 0) { | 286 | if (rc != 0) { |
283 | dev_err(&op->dev, "Failed to register DAI\n"); | 287 | dev_err(&op->dev, "Failed to register DAI\n"); |
@@ -303,6 +307,7 @@ static int __devinit psc_ac97_of_probe(struct platform_device *op) | |||
303 | 307 | ||
304 | static int __devexit psc_ac97_of_remove(struct platform_device *op) | 308 | static int __devexit psc_ac97_of_remove(struct platform_device *op) |
305 | { | 309 | { |
310 | mpc5200_audio_dma_destroy(op); | ||
306 | snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_ac97_dai)); | 311 | snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_ac97_dai)); |
307 | return 0; | 312 | return 0; |
308 | } | 313 | } |