diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 18:47:58 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 18:47:58 -0400 |
| commit | 2ef39e606bb43d6041b6d820e2a9156110a82d21 (patch) | |
| tree | 7c4cb8bd147d962344d357569172dfbe35f098a6 /include/linux | |
| parent | a89be93c28cd656d1c3c49fe627666b3bbecd45a (diff) | |
| parent | b4cad7af6665743647f28119b689e1552326d4da (diff) | |
Merge remote-tracking branch 'asoc/topic/ux500' into for-3.7
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/abx500/ab8500-codec.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/mfd/abx500/ab8500-codec.h b/include/linux/mfd/abx500/ab8500-codec.h index dc6529202cdd..d7079413def0 100644 --- a/include/linux/mfd/abx500/ab8500-codec.h +++ b/include/linux/mfd/abx500/ab8500-codec.h | |||
| @@ -23,7 +23,8 @@ enum amic_type { | |||
| 23 | /* Mic-biases */ | 23 | /* Mic-biases */ |
| 24 | enum amic_micbias { | 24 | enum amic_micbias { |
| 25 | AMIC_MICBIAS_VAMIC1, | 25 | AMIC_MICBIAS_VAMIC1, |
| 26 | AMIC_MICBIAS_VAMIC2 | 26 | AMIC_MICBIAS_VAMIC2, |
| 27 | AMIC_MICBIAS_UNKNOWN | ||
| 27 | }; | 28 | }; |
| 28 | 29 | ||
| 29 | /* Bias-voltage */ | 30 | /* Bias-voltage */ |
| @@ -31,7 +32,8 @@ enum ear_cm_voltage { | |||
| 31 | EAR_CMV_0_95V, | 32 | EAR_CMV_0_95V, |
| 32 | EAR_CMV_1_10V, | 33 | EAR_CMV_1_10V, |
| 33 | EAR_CMV_1_27V, | 34 | EAR_CMV_1_27V, |
| 34 | EAR_CMV_1_58V | 35 | EAR_CMV_1_58V, |
| 36 | EAR_CMV_UNKNOWN | ||
| 35 | }; | 37 | }; |
| 36 | 38 | ||
| 37 | /* Analog microphone settings */ | 39 | /* Analog microphone settings */ |