diff options
| author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-01-10 14:36:20 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:50 +0100 |
| commit | 0b4d221b8d56deefca4984d01b3a010107ae1f72 (patch) | |
| tree | fb4d9923416fedeee04632eac5a8ee760bf37f0e /include | |
| parent | [ALSA] Fix inverted Phone volume WM9712 mixer control (diff) | |
| download | linux-0b4d221b8d56deefca4984d01b3a010107ae1f72.tar.xz linux-0b4d221b8d56deefca4984d01b3a010107ae1f72.zip | |
[ALSA] soc - Add device level DAPM event
Added a device level dapm event so that both the machine and codec are informed
when dapm events occur.
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dapm.h | 1 | ||||
| -rw-r--r-- | include/sound/soc.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index b9d586442518..4158cbaa0f25 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -199,6 +199,7 @@ void snd_soc_dapm_free(struct snd_soc_device *socdev); /* dapm events */ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec, char *stream, int event); +int snd_soc_dapm_device_event(struct snd_soc_device *socdev, int event); /* dapm sys fs - used by the core */ int snd_soc_dapm_sys_add(struct device *dev); diff --git a/include/sound/soc.h b/include/sound/soc.h index c22c65650405..add5f948e383 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -425,6 +425,9 @@ struct snd_soc_machine { int (*resume_pre)(struct platform_device *pdev); int (*resume_post)(struct platform_device *pdev); + /* callbacks */ + int (*dapm_event)(struct snd_soc_machine *, int event); + /* CPU <--> Codec DAI links */ struct snd_soc_dai_link *dai_link; int num_links; |