diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-11-09 11:52:22 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-11-09 11:52:22 +0400 |
| commit | bcca5fa6d786755abe91f5856c9647a2ca2a51b6 (patch) | |
| tree | 12a909ba4c04252e882bc8622f4aa86015d45720 /include/linux | |
| parent | 8d1c963a2e0c57dfe7f9c356389902e500cf1cfd (diff) | |
| parent | 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (diff) | |
| download | linux-bcca5fa6d786755abe91f5856c9647a2ca2a51b6.tar.xz | |
Merge branch 'fix/asoc' into for-linus
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 @@ #define WM8958_MICB2_DISCH_WIDTH 1 /* MICB2_DISCH */ /* + * R210 (0xD2) - Mic Detect 3 + */ +#define WM8958_MICD_LVL_MASK 0x07FC /* MICD_LVL - [10:2] */ +#define WM8958_MICD_LVL_SHIFT 2 /* MICD_LVL - [10:2] */ +#define WM8958_MICD_LVL_WIDTH 9 /* MICD_LVL - [10:2] */ +#define WM8958_MICD_VALID 0x0002 /* MICD_VALID */ +#define WM8958_MICD_VALID_MASK 0x0002 /* MICD_VALID */ +#define WM8958_MICD_VALID_SHIFT 1 /* MICD_VALID */ +#define WM8958_MICD_VALID_WIDTH 1 /* MICD_VALID */ +#define WM8958_MICD_STS 0x0001 /* MICD_STS */ +#define WM8958_MICD_STS_MASK 0x0001 /* MICD_STS */ +#define WM8958_MICD_STS_SHIFT 0 /* MICD_STS */ +#define WM8958_MICD_STS_WIDTH 1 /* MICD_STS */ + +/* * R76 (0x4C) - Charge Pump (1) */ #define WM8994_CP_ENA 0x8000 /* CP_ENA */ |
