diff options
| author | Mark Brown <broonie@kernel.org> | 2017-04-30 22:15:43 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-30 22:15:43 +0900 |
| commit | cce9b271e5e05ba43ce9332652ef309b9e44c87a (patch) | |
| tree | 6df46e772a83aafd8f84638ee1be0eb4011c4d46 /include | |
| parent | 245e302a4d17d70f223882f6fbd2c4cb35059ca9 (diff) | |
| parent | 97c415a6f6c34b8c3a71b0e6058c89c49bb8285f (diff) | |
| download | linux-cce9b271e5e05ba43ce9332652ef309b9e44c87a.tar.gz linux-cce9b271e5e05ba43ce9332652ef309b9e44c87a.tar.bz2 linux-cce9b271e5e05ba43ce9332652ef309b9e44c87a.zip | |
Merge remote-tracking branch 'asoc/topic/rt5665' into asoc-next
Diffstat (limited to 'include')
| -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 786765fc630b..5170fd81e1fd 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); @@ -729,6 +731,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; @@ -920,6 +923,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 *); |