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 /sound/soc/au1x/psc.h | |
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 'sound/soc/au1x/psc.h')
-rw-r--r-- | sound/soc/au1x/psc.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/au1x/psc.h b/sound/soc/au1x/psc.h index f281443fd52..b30eadd422a 100644 --- a/sound/soc/au1x/psc.h +++ b/sound/soc/au1x/psc.h | |||
@@ -8,16 +8,11 @@ | |||
8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
10 | * | 10 | * |
11 | * NOTE: all of these drivers can only work with a SINGLE instance | ||
12 | * of a PSC. Multiple independent audio devices are impossible | ||
13 | * with ASoC v1. | ||
14 | */ | 11 | */ |
15 | 12 | ||
16 | #ifndef _AU1X_PCM_H | 13 | #ifndef _AU1X_PCM_H |
17 | #define _AU1X_PCM_H | 14 | #define _AU1X_PCM_H |
18 | 15 | ||
19 | extern struct snd_ac97_bus_ops soc_ac97_ops; | ||
20 | |||
21 | /* DBDMA helpers */ | 16 | /* DBDMA helpers */ |
22 | extern struct platform_device *au1xpsc_pcm_add(struct platform_device *pdev); | 17 | extern struct platform_device *au1xpsc_pcm_add(struct platform_device *pdev); |
23 | extern void au1xpsc_pcm_destroy(struct platform_device *dmapd); | 18 | extern void au1xpsc_pcm_destroy(struct platform_device *dmapd); |
@@ -28,6 +23,8 @@ struct au1xpsc_audio_data { | |||
28 | unsigned long cfg; | 23 | unsigned long cfg; |
29 | unsigned long rate; | 24 | unsigned long rate; |
30 | 25 | ||
26 | struct snd_soc_dai_driver dai_drv; | ||
27 | |||
31 | unsigned long pm[2]; | 28 | unsigned long pm[2]; |
32 | struct mutex lock; | 29 | struct mutex lock; |
33 | struct platform_device *dmapd; | 30 | struct platform_device *dmapd; |