Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2...

[~andy/linux] / sound / soc / codecs / wm8994.h

diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h
index d77e06f0a6751f7a1d4394b90324916b6085a34d..f142ec198db3dabfcfc5d1e20a51cdfd5e42874b 100644 (file)
--- a/sound/soc/codecs/wm8994.h
+++ b/sound/soc/codecs/wm8994.h
@@ -28,10 +28,11 @@
 #define WM8994_FLL1 1
 #define WM8994_FLL2 2
 
-#define WM8994_FLL_SRC_MCLK1  1
-#define WM8994_FLL_SRC_MCLK2  2
-#define WM8994_FLL_SRC_LRCLK  3
-#define WM8994_FLL_SRC_BCLK   4
+#define WM8994_FLL_SRC_MCLK1    1
+#define WM8994_FLL_SRC_MCLK2    2
+#define WM8994_FLL_SRC_LRCLK    3
+#define WM8994_FLL_SRC_BCLK     4
+#define WM8994_FLL_SRC_INTERNAL 5
 
 enum wm8994_vmid_mode {
        WM8994_VMID_NORMAL,
@@ -72,7 +73,6 @@ struct wm8994;
 struct wm8994_priv {
        struct wm_hubs_data hubs;
        struct wm8994 *wm8994;
-       struct snd_soc_codec *codec;
        int sysclk[2];
        int sysclk_rate[2];
        int mclk[2];
@@ -81,6 +81,7 @@ struct wm8994_priv {
        struct completion fll_locked[2];
        bool fll_locked_irq;
        bool fll_byp;
+       bool clk_has_run;
 
        int vmid_refcount;
        int active_refcount;
@@ -134,6 +135,7 @@ struct wm8994_priv {
        int btn_mask;
        bool jackdet;
        int jackdet_mode;
+       struct delayed_work jackdet_bootstrap;
 
        wm8958_micdet_cb jack_cb;
        void *jack_cb_data;