diff options
| author | Colin Cross <ccross@android.com> | 2011-03-03 14:17:49 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-03-03 14:17:49 -0800 |
| commit | c871fe663a6368fd0e98f5a3bfd81b0b9c591266 (patch) | |
| tree | d09c244e94c09f985caf259c434c7eda8ff53229 /include/sound/wm8903.h | |
| parent | d5fdafd38ca0c28c4648909ce0afd0a5420309ca (diff) | |
| parent | db811ca0f48578f9940f49f284ac81e336b264ad (diff) | |
| download | linux-stable-c871fe663a6368fd0e98f5a3bfd81b0b9c591266.tar.gz linux-stable-c871fe663a6368fd0e98f5a3bfd81b0b9c591266.tar.bz2 linux-stable-c871fe663a6368fd0e98f5a3bfd81b0b9c591266.zip | |
Merge branch 'for-2639/i2c/i2c-tegra' of git://git.fluff.org/bjdooks/linux into for-next-i2c
Diffstat (limited to 'include/sound/wm8903.h')
| -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 b4a0db2307ef..1eeebd534f7e 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] */ |