diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 05:37:41 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 05:37:41 -0500 |
| commit | 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (patch) | |
| tree | 3f5d8f9f6e5edd991dbc6b51685dd726543e755a /include/linux | |
| parent | 1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff) | |
| parent | 19940b3d55c87d8089a8cb0fa8e5a9918a3846bd (diff) | |
Merge branch 'for-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-3.2
Diffstat (limited to 'include/linux')
| -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 */ |