diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-11 20:45:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-11 20:45:42 -0500 |
| commit | fe10e6f4b24ef8ca12cb4d2368deb4861ab1861b (patch) | |
| tree | 86f524927ce64b07b3ab18254558e7fa766b0688 /include | |
| parent | f28ad3b44a03892b533cfb503273370033594d9d (diff) | |
| parent | d938e66003c9ccc6c0ab10fa31ee23cf27574d66 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: Use kmemdup rather than duplicating its implementation
ALSA: hda - Re-enable the check NO_PRESENCE misc bit
ALSA: vmaster - Free slave-links when freeing the master element
ALSA: hda - Don't add elements of other codecs to vmaster slave
ALSA: intel8x0: improve virtual environment detection
ALSA: intel8x0: move virtual environment detection code into one place
ALSA: snd_usb_audio: add Logitech HD Webcam c510 to quirk-384
ALSA: hda - fix internal mic on Dell Vostro 3500 laptop
ALSA: HDA: Remove quirk for Toshiba T110
ALSA: usb-audio - Fix the missing volume quirks at delayed init
ALSA: hda - Mute unused capture sources for Realtek codecs
ALSA: intel8x0: Improve comments for VM optimization
ASoC: Ensure we get an impedence reported for WM8958 jack detect
ASoC: Don't use wm8994->control_data when requesting IRQs
ASoC: Don't use wm8994->control_data in wm8994_readable_register()
ASoC: Update git repository URL
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/wm8994/registers.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/mfd/wm8994/registers.h b/include/linux/mfd/wm8994/registers.h index fae295048a8b..83a9caec0e43 100644 --- a/include/linux/mfd/wm8994/registers.h +++ b/include/linux/mfd/wm8994/registers.h | |||
| @@ -1963,6 +1963,21 @@ | |||
| 1963 | #define WM8958_MICB2_DISCH_WIDTH 1 /* MICB2_DISCH */ | 1963 | #define WM8958_MICB2_DISCH_WIDTH 1 /* MICB2_DISCH */ |
| 1964 | 1964 | ||
| 1965 | /* | 1965 | /* |
| 1966 | * R210 (0xD2) - Mic Detect 3 | ||
| 1967 | */ | ||
| 1968 | #define WM8958_MICD_LVL_MASK 0x07FC /* MICD_LVL - [10:2] */ | ||
| 1969 | #define WM8958_MICD_LVL_SHIFT 2 /* MICD_LVL - [10:2] */ | ||
| 1970 | #define WM8958_MICD_LVL_WIDTH 9 /* MICD_LVL - [10:2] */ | ||
| 1971 | #define WM8958_MICD_VALID 0x0002 /* MICD_VALID */ | ||
| 1972 | #define WM8958_MICD_VALID_MASK 0x0002 /* MICD_VALID */ | ||
| 1973 | #define WM8958_MICD_VALID_SHIFT 1 /* MICD_VALID */ | ||
| 1974 | #define WM8958_MICD_VALID_WIDTH 1 /* MICD_VALID */ | ||
| 1975 | #define WM8958_MICD_STS 0x0001 /* MICD_STS */ | ||
| 1976 | #define WM8958_MICD_STS_MASK 0x0001 /* MICD_STS */ | ||
| 1977 | #define WM8958_MICD_STS_SHIFT 0 /* MICD_STS */ | ||
| 1978 | #define WM8958_MICD_STS_WIDTH 1 /* MICD_STS */ | ||
| 1979 | |||
| 1980 | /* | ||
| 1966 | * R76 (0x4C) - Charge Pump (1) | 1981 | * R76 (0x4C) - Charge Pump (1) |
| 1967 | */ | 1982 | */ |
| 1968 | #define WM8994_CP_ENA 0x8000 /* CP_ENA */ | 1983 | #define WM8994_CP_ENA 0x8000 /* CP_ENA */ |