diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-17 13:16:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-17 13:16:27 +0100 |
| commit | 3ee5990d0835d5f10c9aad2a856860a213df638a (patch) | |
| tree | 573fb14e6abc12cb3e9e690702d425da41a90b95 /include | |
| parent | Merge branch 'topic/rt5670' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | ASoC: Remove snd_soc_jack_new() (diff) | |
| download | linux-3ee5990d0835d5f10c9aad2a856860a213df638a.tar.xz linux-3ee5990d0835d5f10c9aad2a856860a213df638a.zip | |
Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 76bc944dcb5c..54be47a1a429 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -450,8 +450,10 @@ int soc_dai_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai); /* Jack reporting */ -int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type, - struct snd_soc_jack *jack); +int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type, + struct snd_soc_jack *jack, struct snd_soc_jack_pin *pins, + unsigned int num_pins); + void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask); int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count, struct snd_soc_jack_pin *pins); @@ -659,7 +661,7 @@ struct snd_soc_jack_gpio { struct snd_soc_jack { struct mutex mutex; struct snd_jack *jack; - struct snd_soc_codec *codec; + struct snd_soc_card *card; struct list_head pins; int status; struct blocking_notifier_head notifier; |