Commit eae17754 authored by Mark Brown's avatar Mark Brown Committed by Eric Miao
Browse files

[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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Cc: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 5e901b37

arch/arm/mach-pxa/include/mach/audio.h

+10 −0
Original line number Diff line number Diff line
@@ -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);

include/sound/pxa2xx-lib.h

+0 −15
Original line number Diff line number Diff line
@@ -42,19 +42,4 @@ extern int pxa2xx_ac97_hw_resume(void); 
extern int pxa2xx_ac97_hw_probe(struct platform_device *dev);

extern void pxa2xx_ac97_hw_remove(struct platform_device *dev);



/* AC97 platform_data */

/**

 * struct pxa2xx_ac97_platform_data - pxa ac97 platform data

 * @reset_gpio: AC97 reset gpio (normally gpio113 or gpio95)

 *              a -1 value means no gpio will be used for reset

 *

 * Platform data should only be specified for pxa27x CPUs where a silicon bug

 * prevents correct operation of the reset line. If not specified, the default

 * behaviour is to consider gpio 113 as the AC97 reset line, which is the

 * default on most boards.

 */

struct pxa2xx_ac97_platform_data {

	int reset_gpio;

};



#endif

sound/arm/pxa2xx-ac97-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume); 
int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)

{

	int ret;

	struct pxa2xx_ac97_platform_data *pdata = dev->dev.platform_data;

	pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;



	if (pdata) {

		switch (pdata->reset_gpio) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE