Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

[deliverable/linux.git] / sound / soc / codecs / wm_hubs.h

diff --git a/sound/soc/codecs/wm_hubs.h b/sound/soc/codecs/wm_hubs.h
index da2dc899ce6d58df7a4f34bd6f589ead6e4b2f3f..24c763df21f970344f43c99c720b5c69865a625c 100644 (file)
--- a/sound/soc/codecs/wm_hubs.h
+++ b/sound/soc/codecs/wm_hubs.h
@@ -36,6 +36,9 @@ struct wm_hubs_data {
        struct list_head dcs_cache;
        bool (*check_class_w_digital)(struct snd_soc_codec *);
 
+       int micb1_delay;
+       int micb2_delay;
+
        bool lineout1_se;
        bool lineout1n_ena;
        bool lineout1p_ena;
@@ -46,6 +49,8 @@ struct wm_hubs_data {
 
        bool dcs_done_irq;
        struct completion dcs_done;
+
+       struct snd_soc_codec *codec;
 };
 
 extern int wm_hubs_add_analogue_controls(struct snd_soc_codec *);
@@ -54,6 +59,7 @@ extern int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *,
                                         int lineout1_diff, int lineout2_diff,
                                         int lineout1fb, int lineout2fb,
                                         int jd_scthr, int jd_thr,
+                                        int micbias1_dly, int micbias2_dly,
                                         int micbias1_lvl, int micbias2_lvl);
 
 extern irqreturn_t wm_hubs_dcs_done(int irq, void *data);