projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ASoC: Rename WM8994 detecting flag to mic_detecting
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
codecs
/
wm8994.h
diff --git
a/sound/soc/codecs/wm8994.h
b/sound/soc/codecs/wm8994.h
index f4f1355efc82ec9708e24993525d65aad9b54e1b..8622bc4db2fec45f0b10a266ba469548ccacc929 100644
(file)
--- a/
sound/soc/codecs/wm8994.h
+++ b/
sound/soc/codecs/wm8994.h
@@
-70,10
+70,11
@@
struct wm8994_fll_config {
#define WM8994_NUM_DRC 3
#define WM8994_NUM_EQ 3
#define WM8994_NUM_DRC 3
#define WM8994_NUM_EQ 3
+struct wm8994;
+
struct wm8994_priv {
struct wm_hubs_data hubs;
struct wm8994_priv {
struct wm_hubs_data hubs;
- enum snd_soc_control_type control_type;
- void *control_data;
+ struct wm8994 *wm8994;
struct snd_soc_codec *codec;
int sysclk[2];
int sysclk_rate[2];
struct snd_soc_codec *codec;
int sysclk[2];
int sysclk_rate[2];
@@
-126,6
+127,9
@@
struct wm8994_priv {
struct soc_enum enh_eq_enum;
struct wm8994_micdet micdet[2];
struct soc_enum enh_eq_enum;
struct wm8994_micdet micdet[2];
+ bool mic_detecting;
+ bool jack_mic;
+ int btn_mask;
wm8958_micdet_cb jack_cb;
void *jack_cb_data;
wm8958_micdet_cb jack_cb;
void *jack_cb_data;