summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-13 19:51:04 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-13 19:51:04 +0000
commitf98dedcefdbcbe8d51e77d911583ecc2c2668174 (patch)
tree5bf81fe77322df0ca0c7e8c921302102f8700140 /include/sound
parent905f6952c5bc8126f1d82c2eb8a699271080b57e (diff)
parent3017358a75917b5ed5ad361c02ba2a7e257d3b2a (diff)
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/wm8903.h10
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] */