diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 06:06:46 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 06:06:46 -0500 |
commit | 315472d5abca4d4db90ba654fd616b9a694c80cf (patch) | |
tree | 27510f454328dd1fac3d3855ceac44edf1bc71d8 /include/sound | |
parent | 56b3f31fb384124790279ad39eb02ee66df4b9fd (diff) | |
parent | e2e8bfdf61573c98162d1112b971d8d00f00fcf8 (diff) |
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 ffd9bc793105..9407fd00363b 100644 --- a/include/sound/tlv320aic3x.h +++ b/include/sound/tlv320aic3x.h | |||
@@ -46,6 +46,13 @@ enum { | |||
46 | AIC3X_GPIO2_FUNC_BUTTON_PRESS_IRQ = 15 | 46 | AIC3X_GPIO2_FUNC_BUTTON_PRESS_IRQ = 15 |
47 | }; | 47 | }; |
48 | 48 | ||
49 | enum aic3x_micbias_voltage { | ||
50 | AIC3X_MICBIAS_OFF = 0, | ||
51 | AIC3X_MICBIAS_2_0V = 1, | ||
52 | AIC3X_MICBIAS_2_5V = 2, | ||
53 | AIC3X_MICBIAS_AVDDV = 3, | ||
54 | }; | ||
55 | |||
49 | struct aic3x_setup_data { | 56 | struct aic3x_setup_data { |
50 | unsigned int gpio_func[2]; | 57 | unsigned int gpio_func[2]; |
51 | }; | 58 | }; |
@@ -53,6 +60,9 @@ struct aic3x_setup_data { | |||
53 | struct aic3x_pdata { | 60 | struct aic3x_pdata { |
54 | int gpio_reset; /* < 0 if not used */ | 61 | int gpio_reset; /* < 0 if not used */ |
55 | struct aic3x_setup_data *setup; | 62 | struct aic3x_setup_data *setup; |
63 | |||
64 | /* Selects the micbias voltage */ | ||
65 | enum aic3x_micbias_voltage micbias_vg; | ||
56 | }; | 66 | }; |
57 | 67 | ||
58 | #endif | 68 | #endif |