ASoC: da7219: Add support for 1.6V micbias level

HW can provide 1.6V micbias level as well the existing levels
already provided in the driver. This patch adds support for 1.6V
to the DT binding.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/devicetree/bindings/sound/da7219.txt b/Documentation/devicetree/bindings/sound/da7219.txt
index 062a2a08250eb859d6b1aaa044a02954ce628b17..cf61681826b675ad984dc17f6c1dbcc2e1b6fc35 100644 (file)
--- a/Documentation/devicetree/bindings/sound/da7219.txt
+++ b/Documentation/devicetree/bindings/sound/da7219.txt
@@ -29,7 +29,7 @@ Optional properties:
 - clock-names : Clock name string for 'clocks' attribute, should be "mclk".
 
 - dlg,micbias-lvl : Voltage (mV) for Mic Bias
-       [<1800>, <2000>, <2200>, <2400>, <2600>]
+       [<1600>, <1800>, <2000>, <2200>, <2400>, <2600>]
 - dlg,mic-amp-in-sel : Mic input source type
        ["diff", "se_p", "se_n"]
 

diff --git a/include/sound/da7219.h b/include/sound/da7219.h
index 307198b469bc1f29e3a5dd145a0d1ef2827a9942..02876acdc8406a5bda9351051dabac54fc2b3641 100644 (file)
--- a/include/sound/da7219.h
+++ b/include/sound/da7219.h
@@ -16,7 +16,8 @@
 
 /* Mic Bias */
 enum da7219_micbias_voltage {
-       DA7219_MICBIAS_1_8V = 1,
+       DA7219_MICBIAS_1_6V = 0,
+       DA7219_MICBIAS_1_8V,
        DA7219_MICBIAS_2_0V,
        DA7219_MICBIAS_2_2V,
        DA7219_MICBIAS_2_4V,

diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 2630c503e3df835dbe7dc525f575828b3e85ada9..371768092e17a2951ba67c30793d849fe0f69f81 100644 (file)
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -1410,6 +1410,8 @@ static enum da7219_micbias_voltage
        da7219_of_micbias_lvl(struct snd_soc_codec *codec, u32 val)
 {
        switch (val) {
+       case 1600:
+               return DA7219_MICBIAS_1_6V;
        case 1800:
                return DA7219_MICBIAS_1_8V;
        case 2000:
@@ -1571,6 +1573,7 @@ static void da7219_handle_pdata(struct snd_soc_codec *codec)
 
                /* Mic Bias voltages */
                switch (pdata->micbias_lvl) {
+               case DA7219_MICBIAS_1_6V:
                case DA7219_MICBIAS_1_8V:
                case DA7219_MICBIAS_2_0V:
                case DA7219_MICBIAS_2_2V: