Merge remote-tracking branch 'asoc/topic/rt5665' into asoc-next

[mirror_ubuntu-bionic-kernel.git] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 786765fc630bd440596afa38bed9e4dde1bd3e76..5170fd81e1fd0886c465225b72748c44792240d5 100644 (file)
--- 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 *);