diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:46 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:46 +0000 |
commit | 315472d5abca4d4db90ba654fd616b9a694c80cf (patch) | |
tree | 27510f454328dd1fac3d3855ceac44edf1bc71d8 /include/sound | |
parent | 56b3f31fb384124790279ad39eb02ee66df4b9fd (diff) | |
parent | e2e8bfdf61573c98162d1112b971d8d00f00fcf8 (diff) | |
download | op-kernel-dev-315472d5abca4d4db90ba654fd616b9a694c80cf.zip op-kernel-dev-315472d5abca4d4db90ba654fd616b9a694c80cf.tar.gz |
Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/tlv320aic3x.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/sound/tlv320aic3x.h b/include/sound/tlv320aic3x.h index ffd9bc7..9407fd0 100644 --- a/include/sound/tlv320aic3x.h +++ b/include/sound/tlv320aic3x.h @@ -46,6 +46,13 @@ enum { AIC3X_GPIO2_FUNC_BUTTON_PRESS_IRQ = 15 }; +enum aic3x_micbias_voltage { + AIC3X_MICBIAS_OFF = 0, + AIC3X_MICBIAS_2_0V = 1, + AIC3X_MICBIAS_2_5V = 2, + AIC3X_MICBIAS_AVDDV = 3, +}; + struct aic3x_setup_data { unsigned int gpio_func[2]; }; @@ -53,6 +60,9 @@ struct aic3x_setup_data { struct aic3x_pdata { int gpio_reset; /* < 0 if not used */ struct aic3x_setup_data *setup; + + /* Selects the micbias voltage */ + enum aic3x_micbias_voltage micbias_vg; }; #endif |