diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:49 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:49 +0000 |
commit | 3bb26706d929cb922c41edd03d1e4a89f2734cea (patch) | |
tree | 8e397556497e7b1db0d047d9be275ce7067d895f /include/sound | |
parent | 3dc4b7af38d14fc7eeab18f3c08d533ad84a187e (diff) | |
parent | 1a786243235b8a8f4762ee57f185dadd97794fa4 (diff) | |
download | linux-3.10-3bb26706d929cb922c41edd03d1e4a89f2734cea.tar.gz linux-3.10-3bb26706d929cb922c41edd03d1e4a89f2734cea.tar.bz2 linux-3.10-3bb26706d929cb922c41edd03d1e4a89f2734cea.zip |
Merge remote-tracking branch 'asoc/topic/wm2200' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/wm2200.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/include/sound/wm2200.h b/include/sound/wm2200.h index 79bf55be7ff..bc7ab1a4b48 100644 --- a/include/sound/wm2200.h +++ b/include/sound/wm2200.h @@ -12,6 +12,7 @@ #define __LINUX_SND_WM2200_H #define WM2200_GPIO_SET 0x10000 +#define WM2200_MAX_MICBIAS 2 enum wm2200_in_mode { WM2200_IN_SE = 0, @@ -25,6 +26,24 @@ enum wm2200_dmic_sup { WM2200_DMIC_SUP_MICBIAS2 = 2, }; +enum wm2200_mbias_lvl { + WM2200_MBIAS_LVL_1V5 = 1, + WM2200_MBIAS_LVL_1V8 = 2, + WM2200_MBIAS_LVL_1V9 = 3, + WM2200_MBIAS_LVL_2V0 = 4, + WM2200_MBIAS_LVL_2V2 = 5, + WM2200_MBIAS_LVL_2V4 = 6, + WM2200_MBIAS_LVL_2V5 = 7, + WM2200_MBIAS_LVL_2V6 = 8, +}; + +struct wm2200_micbias { + enum wm2200_mbias_lvl mb_lvl; /** Regulated voltage */ + unsigned int discharge:1; /** Actively discharge */ + unsigned int fast_start:1; /** Enable aggressive startup ramp rate */ + unsigned int bypass:1; /** Use bypass mode */ +}; + struct wm2200_pdata { int reset; /** GPIO controlling /RESET, if any */ int ldo_ena; /** GPIO controlling LODENA, if any */ @@ -35,7 +54,8 @@ struct wm2200_pdata { enum wm2200_in_mode in_mode[3]; enum wm2200_dmic_sup dmic_sup[3]; - int micbias_cfg[2]; /** Register value to configure MICBIAS */ + /** MICBIAS configurations */ + struct wm2200_micbias micbias[WM2200_MAX_MICBIAS]; }; #endif |