diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
| commit | d71f4cece4bd97d05592836202fc04ff2e7817e3 (patch) | |
| tree | 6c877c7a938758b1323d9c97d46b9c536e618c69 /sound/soc/codecs/wm8994.h | |
| parent | 19008bdacb9f7841166ebafe0aef361ee582ffbf (diff) | |
| parent | ad8332c1302bcb4f80d593fd3eb477be9d7f5604 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
sound/soc/codecs/ad1938.c
Diffstat (limited to 'sound/soc/codecs/wm8994.h')
| -rw-r--r-- | sound/soc/codecs/wm8994.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h index 0a5e1424dea0..7072dc539354 100644 --- a/sound/soc/codecs/wm8994.h +++ b/sound/soc/codecs/wm8994.h | |||
| @@ -23,4 +23,12 @@ extern struct snd_soc_dai wm8994_dai[]; | |||
| 23 | #define WM8994_FLL1 1 | 23 | #define WM8994_FLL1 1 |
| 24 | #define WM8994_FLL2 2 | 24 | #define WM8994_FLL2 2 |
| 25 | 25 | ||
| 26 | #define WM8994_FLL_SRC_MCLK1 1 | ||
| 27 | #define WM8994_FLL_SRC_MCLK2 2 | ||
| 28 | #define WM8994_FLL_SRC_LRCLK 3 | ||
| 29 | #define WM8994_FLL_SRC_BCLK 4 | ||
| 30 | |||
| 31 | int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, | ||
| 32 | int micbias, int det, int shrt); | ||
| 33 | |||
| 26 | #endif | 34 | #endif |