lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: Allow passing platform_data to devices attached to AC97 bus

Browse Source 
This patch allows passing platform_data to devices attached to AC97 bus
(like touchscreens, battery measurement chips ...).

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Marek Vasut
2009-07-22 13:01:03 +02:00
committed by Mark Brown
parent a7569afa8b
commit 474828a40f
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/sound/ac97_codec.h
View File

@@ -642,4 +642,10 @@ int snd_ac97_pcm_double_rate_rules(struct snd_pcm_runtime *runtime);
/* ad hoc AC97 device driver access */ /* ad hoc AC97 device driver access */
extern struct bus_type ac97_bus_type; extern struct bus_type ac97_bus_type;
/* AC97 platform_data adding function */
static inline void snd_ac97_dev_add_pdata(struct snd_ac97 *ac97, void *data)
{
ac97->dev.platform_data = data;
}
#endif /* __SOUND_AC97_CODEC_H */ #endif /* __SOUND_AC97_CODEC_H */

1
include/sound/soc-dai.h
View File

@@ -179,6 +179,7 @@ struct snd_soc_dai {
int ac97_control; int ac97_control;
struct device *dev; struct device *dev;
void *ac97_pdata; /* platform_data for the ac97 codec */
/* DAI callbacks */ /* DAI callbacks */
int (*probe)(struct platform_device *pdev, int (*probe)(struct platform_device *pdev,

6
sound/soc/soc-core.c
View File

@@ -28,6 +28,7 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <sound/ac97_codec.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
@@ -1461,8 +1462,11 @@ int snd_soc_init_card(struct snd_soc_device *socdev)
continue; continue;
} }
} }
if (card->dai_link[i].codec_dai->ac97_control) if (card->dai_link[i].codec_dai->ac97_control) {
ac97 = 1; ac97 = 1;
snd_ac97_dev_add_pdata(codec->ac97,
card->dai_link[i].cpu_dai->ac97_pdata);
}
} }
snprintf(codec->card->shortname, sizeof(codec->card->shortname), snprintf(codec->card->shortname, sizeof(codec->card->shortname),
"%s", card->name); "%s", card->name);