diff options
| author | Mark Brown <broonie@kernel.org> | 2017-04-11 16:58:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-11 16:58:30 +0100 |
| commit | b8d4f7a30bab878d8909bb6ee73e8ac47a1646bf (patch) | |
| tree | bb823543361a4ce60327b922f2f202627e6dac40 /include/sound/soc.h | |
| parent | 17febfa6071bc673892edda6b1998ccfc7456c4e (diff) | |
| parent | d7344010d183ad62d1ababca3beb9553cf5e1546 (diff) | |
| download | linux-b8d4f7a30bab878d8909bb6ee73e8ac47a1646bf.tar.bz2 | |
Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5665
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index cdfb55f7aede..5bbb3a6767c3 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -434,6 +434,8 @@ int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id, int source, unsigned int freq, int dir); int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source, unsigned int freq_in, unsigned int freq_out); +int snd_soc_codec_set_jack(struct snd_soc_codec *codec, + struct snd_soc_jack *jack, void *data); int snd_soc_register_card(struct snd_soc_card *card); int snd_soc_unregister_card(struct snd_soc_card *card); @@ -721,6 +723,7 @@ struct snd_soc_jack_gpio { /* private: */ struct snd_soc_jack *jack; struct delayed_work work; + struct notifier_block pm_notifier; struct gpio_desc *desc; void *data; @@ -913,6 +916,8 @@ struct snd_soc_codec_driver { int clk_id, int source, unsigned int freq, int dir); int (*set_pll)(struct snd_soc_codec *codec, int pll_id, int source, unsigned int freq_in, unsigned int freq_out); + int (*set_jack)(struct snd_soc_codec *codec, + struct snd_soc_jack *jack, void *data); /* codec IO */ struct regmap *(*get_regmap)(struct device *); |