A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ARM] pxa: merge AC97 platform data structures

Browse source 
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 <[email protected]>
Acked-by: Robert Jarzmik <[email protected]>
Cc: Marek Vasut <[email protected]>
Signed-off-by: Eric Miao <[email protected]>
This commit is contained in:
Mark Brown 2009-04-13 11:48:03 +01:00 • committed by Eric Miao
commit eae17754ab
3 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sound/arm/pxa2xx-ac97-lib.c
View file

@ -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) {