diff options
author | Manuel Lauss <manuel.lauss@googlemail.com> | 2010-08-26 08:53:51 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-31 08:06:31 -0400 |
commit | ffc4fdbbe1b4be79e98340ebcd5a0ade6f5de318 (patch) | |
tree | e4f16ef2561497482df5ac9039ba7bdb21212b2d /arch/mips | |
parent | 0bb5f267af41c39af895faee3abe2d9ab8c562e0 (diff) |
ASoC: fix au1x platform
This patch fixes up the au1x audio platform after the multi-component
merge:
- compile fixes and updates to get DB1200 platform audio working again,
- removal of global variables in AC97/I2S/DMA(PCM) modules.
The AC97 part is limited to one instance only for now due to issues
with getting at driver data in the soc_ac97_ops.
Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/alchemy/devboards/db1200/platform.c | 6 |
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 3fa34c3abc04..fbb55935b99e 100644 --- a/arch/mips/alchemy/devboards/db1200/platform.c +++ b/arch/mips/alchemy/devboards/db1200/platform.c | |||
@@ -429,6 +429,11 @@ static struct platform_device db1200_audio_dev = { | |||
429 | .resource = au1200_psc1_res, | 429 | .resource = au1200_psc1_res, |
430 | }; | 430 | }; |
431 | 431 | ||
432 | static struct platform_device db1200_stac_dev = { | ||
433 | .name = "ac97-codec", | ||
434 | .id = 1, /* on PSC1 */ | ||
435 | }; | ||
436 | |||
432 | static struct platform_device *db1200_devs[] __initdata = { | 437 | static struct platform_device *db1200_devs[] __initdata = { |
433 | NULL, /* PSC0, selected by S6.8 */ | 438 | NULL, /* PSC0, selected by S6.8 */ |
434 | &db1200_ide_dev, | 439 | &db1200_ide_dev, |
@@ -436,6 +441,7 @@ static struct platform_device *db1200_devs[] __initdata = { | |||
436 | &db1200_rtc_dev, | 441 | &db1200_rtc_dev, |
437 | &db1200_nand_dev, | 442 | &db1200_nand_dev, |
438 | &db1200_audio_dev, | 443 | &db1200_audio_dev, |
444 | &db1200_stac_dev, | ||
439 | }; | 445 | }; |
440 | 446 | ||
441 | static int __init db1200_dev_init(void) | 447 | static int __init db1200_dev_init(void) |