aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2011-07-25 07:45:02 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-27 14:16:23 -0400
commit5b0912be7a8ff1dbfe56358c5f933d65445bb8af (patch)
tree6b0681c2a5e783be00d4f404ad902596b3235b9f /arch
parent7137c6bcb7ff5d0e6f63f8a4175d5b77dc79abc0 (diff)
ASoC: au1x: remove automatic DMA device registration from PSC drivers
The PSC audio drivers (psc-ac97/psc-i2s) register the DMA platform_device on their own. This is frowned upon, from now on board code must register a simple pcm dma platform device for each PSC with sound duties. Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com> Acked-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/alchemy/devboards/db1200/platform.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/alchemy/devboards/db1200/platform.c b/arch/mips/alchemy/devboards/db1200/platform.c
index fbb55935b99..cfb71aed4cb 100644
--- a/arch/mips/alchemy/devboards/db1200/platform.c
+++ b/arch/mips/alchemy/devboards/db1200/platform.c
@@ -434,12 +434,18 @@ static struct platform_device db1200_stac_dev = {
434 .id = 1, /* on PSC1 */ 434 .id = 1, /* on PSC1 */
435}; 435};
436 436
437static struct platform_device db1200_audiodma_dev = {
438 .name = "au1xpsc-pcm",
439 .id = 1, /* PSC ID */
440};
441
437static struct platform_device *db1200_devs[] __initdata = { 442static struct platform_device *db1200_devs[] __initdata = {
438 NULL, /* PSC0, selected by S6.8 */ 443 NULL, /* PSC0, selected by S6.8 */
439 &db1200_ide_dev, 444 &db1200_ide_dev,
440 &db1200_eth_dev, 445 &db1200_eth_dev,
441 &db1200_rtc_dev, 446 &db1200_rtc_dev,
442 &db1200_nand_dev, 447 &db1200_nand_dev,
448 &db1200_audiodma_dev,
443 &db1200_audio_dev, 449 &db1200_audio_dev,
444 &db1200_stac_dev, 450 &db1200_stac_dev,
445}; 451};