summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/sound/da7219.txt2
-rw-r--r--include/sound/da7219.h3
-rw-r--r--sound/soc/codecs/da7219.c3
3 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/da7219.txt b/Documentation/devicetree/bindings/sound/da7219.txt
index 062a2a08250e..cf61681826b6 100644
--- a/Documentation/devicetree/bindings/sound/da7219.txt
+++ b/Documentation/devicetree/bindings/sound/da7219.txt
@@ -29,7 +29,7 @@ Optional properties:
29- clock-names : Clock name string for 'clocks' attribute, should be "mclk". 29- clock-names : Clock name string for 'clocks' attribute, should be "mclk".
30 30
31- dlg,micbias-lvl : Voltage (mV) for Mic Bias 31- dlg,micbias-lvl : Voltage (mV) for Mic Bias
32 [<1800>, <2000>, <2200>, <2400>, <2600>] 32 [<1600>, <1800>, <2000>, <2200>, <2400>, <2600>]
33- dlg,mic-amp-in-sel : Mic input source type 33- dlg,mic-amp-in-sel : Mic input source type
34 ["diff", "se_p", "se_n"] 34 ["diff", "se_p", "se_n"]
35 35
diff --git a/include/sound/da7219.h b/include/sound/da7219.h
index 307198b469bc..02876acdc840 100644
--- a/include/sound/da7219.h
+++ b/include/sound/da7219.h
@@ -16,7 +16,8 @@
16 16
17/* Mic Bias */ 17/* Mic Bias */
18enum da7219_micbias_voltage { 18enum da7219_micbias_voltage {
19 DA7219_MICBIAS_1_8V = 1, 19 DA7219_MICBIAS_1_6V = 0,
20 DA7219_MICBIAS_1_8V,
20 DA7219_MICBIAS_2_0V, 21 DA7219_MICBIAS_2_0V,
21 DA7219_MICBIAS_2_2V, 22 DA7219_MICBIAS_2_2V,
22 DA7219_MICBIAS_2_4V, 23 DA7219_MICBIAS_2_4V,
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 2630c503e3df..371768092e17 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -1410,6 +1410,8 @@ static enum da7219_micbias_voltage
1410 da7219_of_micbias_lvl(struct snd_soc_codec *codec, u32 val) 1410 da7219_of_micbias_lvl(struct snd_soc_codec *codec, u32 val)
1411{ 1411{
1412 switch (val) { 1412 switch (val) {
1413 case 1600:
1414 return DA7219_MICBIAS_1_6V;
1413 case 1800: 1415 case 1800:
1414 return DA7219_MICBIAS_1_8V; 1416 return DA7219_MICBIAS_1_8V;
1415 case 2000: 1417 case 2000:
@@ -1571,6 +1573,7 @@ static void da7219_handle_pdata(struct snd_soc_codec *codec)
1571 1573
1572 /* Mic Bias voltages */ 1574 /* Mic Bias voltages */
1573 switch (pdata->micbias_lvl) { 1575 switch (pdata->micbias_lvl) {
1576 case DA7219_MICBIAS_1_6V:
1574 case DA7219_MICBIAS_1_8V: 1577 case DA7219_MICBIAS_1_8V:
1575 case DA7219_MICBIAS_2_0V: 1578 case DA7219_MICBIAS_2_0V:
1576 case DA7219_MICBIAS_2_2V: 1579 case DA7219_MICBIAS_2_2V: