diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-13 20:51:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-13 20:51:04 +0100 |
| commit | f98dedcefdbcbe8d51e77d911583ecc2c2668174 (patch) | |
| tree | 5bf81fe77322df0ca0c7e8c921302102f8700140 /include | |
| parent | ASoC: Warn if WM8903 platform data is used to enable microphone IRQ (diff) | |
| parent | ASoC: Ensure supplies are maintained for force enabled widgets (diff) | |
| download | linux-f98dedcefdbcbe8d51e77d911583ecc2c2668174.tar.xz linux-f98dedcefdbcbe8d51e77d911583ecc2c2668174.zip | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/wm8903.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/sound/wm8903.h b/include/sound/wm8903.h index 86172cf4339f..cf7ccb76a8de 100644 --- a/include/sound/wm8903.h +++ b/include/sound/wm8903.h @@ -17,13 +17,9 @@ /* * R6 (0x06) - Mic Bias Control 0 */ -#define WM8903_MICDET_HYST_ENA 0x0080 /* MICDET_HYST_ENA */ -#define WM8903_MICDET_HYST_ENA_MASK 0x0080 /* MICDET_HYST_ENA */ -#define WM8903_MICDET_HYST_ENA_SHIFT 7 /* MICDET_HYST_ENA */ -#define WM8903_MICDET_HYST_ENA_WIDTH 1 /* MICDET_HYST_ENA */ -#define WM8903_MICDET_THR_MASK 0x0070 /* MICDET_THR - [6:4] */ -#define WM8903_MICDET_THR_SHIFT 4 /* MICDET_THR - [6:4] */ -#define WM8903_MICDET_THR_WIDTH 3 /* MICDET_THR - [6:4] */ +#define WM8903_MICDET_THR_MASK 0x0030 /* MICDET_THR - [5:4] */ +#define WM8903_MICDET_THR_SHIFT 4 /* MICDET_THR - [5:4] */ +#define WM8903_MICDET_THR_WIDTH 2 /* MICDET_THR - [5:4] */ #define WM8903_MICSHORT_THR_MASK 0x000C /* MICSHORT_THR - [3:2] */ #define WM8903_MICSHORT_THR_SHIFT 2 /* MICSHORT_THR - [3:2] */ #define WM8903_MICSHORT_THR_WIDTH 2 /* MICSHORT_THR - [3:2] */ |