diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:41 +0100 |
| commit | 27b92d4ff2be2359a21ff4acde5b63563ff720e2 (patch) | |
| tree | 49691b22fe1318aa68d5ebdff74795f004f0cf8f /include/linux | |
| parent | 5de0ee574be8f6922a6c33f2fbc7e9b130a2f626 (diff) | |
| parent | e58a8947b0264ec1f43ce5deef563b72acf1284f (diff) | |
| download | linux-stable-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.gz linux-stable-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.bz2 linux-stable-27b92d4ff2be2359a21ff4acde5b63563ff720e2.zip | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/wm8994/pdata.h | 12 | ||||
| -rw-r--r-- | include/linux/mfd/wm8994/registers.h | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h index 9eab263658be..466b1c777aff 100644 --- a/include/linux/mfd/wm8994/pdata.h +++ b/include/linux/mfd/wm8994/pdata.h @@ -103,13 +103,21 @@ struct wm8994_pdata { unsigned int lineout1fb:1; unsigned int lineout2fb:1; - /* Microphone biases: 0=0.9*AVDD1 1=0.65*AVVD1 */ + /* IRQ for microphone detection if brought out directly as a + * signal. + */ + int micdet_irq; + + /* WM8994 microphone biases: 0=0.9*AVDD1 1=0.65*AVVD1 */ unsigned int micbias1_lvl:1; unsigned int micbias2_lvl:1; - /* Jack detect threashold levels, see datasheet for values */ + /* WM8994 jack detect threashold levels, see datasheet for values */ unsigned int jd_scthr:2; unsigned int jd_thr:2; + + /* WM8958 microphone bias configuration */ + int micbias[2]; }; #endif diff --git a/include/linux/mfd/wm8994/registers.h b/include/linux/mfd/wm8994/registers.h index be072faec6f0..f3ee84284670 100644 --- a/include/linux/mfd/wm8994/registers.h +++ b/include/linux/mfd/wm8994/registers.h @@ -63,6 +63,8 @@ #define WM8994_MICBIAS 0x3A #define WM8994_LDO_1 0x3B #define WM8994_LDO_2 0x3C +#define WM8958_MICBIAS1 0x3D +#define WM8958_MICBIAS2 0x3E #define WM8994_CHARGE_PUMP_1 0x4C #define WM8958_CHARGE_PUMP_2 0x4D #define WM8994_CLASS_W_1 0x51 |