diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-13 11:48:03 +0100 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-04-15 10:54:06 +0800 |
commit | eae17754ab1ffc88190ebcbd33b6bec79e6e559a (patch) | |
tree | 45ec47b21bf0ea823f7c2010eed45b23109ba142 /arch | |
parent | 5e901b37e4a8a305542ad3a776bce997efd7e5e9 (diff) | |
download | linux-stable-eae17754ab1ffc88190ebcbd33b6bec79e6e559a.tar.gz linux-stable-eae17754ab1ffc88190ebcbd33b6bec79e6e559a.tar.bz2 linux-stable-eae17754ab1ffc88190ebcbd33b6bec79e6e559a.zip |
[ARM] pxa: merge AC97 platform data structures
Currently there are two possible platform datas for the PXA AC97 driver:
one supported by the generic AC97 driver only which provides callbacks
to allow board-specific configuration at stream startup and teardown,
and another for pxa2xx-ac97-lib which allows configuration of the reset
GPIO for PXA2xx CPUs.
Obviously this won't actually work when using the generic AC97 driver
since the drivers will attempt to parse the platform data in both
formats. Fix this by merging the two structures.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/audio.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/audio.h b/arch/arm/mach-pxa/include/mach/audio.h index f82f96dd1053..16eb02552d5d 100644 --- a/arch/arm/mach-pxa/include/mach/audio.h +++ b/arch/arm/mach-pxa/include/mach/audio.h @@ -4,12 +4,22 @@ #include <sound/core.h> #include <sound/pcm.h> +/* + * @reset_gpio: AC97 reset gpio (normally gpio113 or gpio95) + * a -1 value means no gpio will be used for reset + + * reset_gpio should only be specified for pxa27x CPUs where a silicon + * bug prevents correct operation of the reset line. If not specified, + * the default behaviour on these CPUs is to consider gpio 113 as the + * AC97 reset line, which is the default on most boards. + */ typedef struct { int (*startup)(struct snd_pcm_substream *, void *); void (*shutdown)(struct snd_pcm_substream *, void *); void (*suspend)(void *); void (*resume)(void *); void *priv; + int reset_gpio; } pxa2xx_audio_ops_t; extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops); |