Commit 0e36f32f authored by Dan Murphy's avatar Dan Murphy Committed by Mark Brown

ASoC: tlv320adcx140: Fix bias config values

The device tree binding declares the ti,mic-bias-source and the
ti,vref-source properties as u32.  The code reads them as u8 which is
incorrect.  Since the device tree binding indicates them as u32 the
conde needs to be updated to read u32.

In addition the bias source needs to be shifted 4 bits to
correctly write the register.

driver family")

Fixes: 37bde5acf040 ("ASoC: tlv320adcx140: Add the tlv320adcx140 codec
Signed-off-by: default avatarDan Murphy <dmurphy@ti.com>
Link: https://lore.kernel.org/r/20200513142807.11802-1-dmurphy@ti.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 65e412a0
...@@ -739,11 +739,12 @@ static int adcx140_codec_probe(struct snd_soc_component *component) ...@@ -739,11 +739,12 @@ static int adcx140_codec_probe(struct snd_soc_component *component)
{ {
struct adcx140_priv *adcx140 = snd_soc_component_get_drvdata(component); struct adcx140_priv *adcx140 = snd_soc_component_get_drvdata(component);
int sleep_cfg_val = ADCX140_WAKE_DEV; int sleep_cfg_val = ADCX140_WAKE_DEV;
u8 bias_source; u32 bias_source;
u8 vref_source; u32 vref_source;
u8 bias_cfg;
int ret; int ret;
ret = device_property_read_u8(adcx140->dev, "ti,mic-bias-source", ret = device_property_read_u32(adcx140->dev, "ti,mic-bias-source",
&bias_source); &bias_source);
if (ret) if (ret)
bias_source = ADCX140_MIC_BIAS_VAL_VREF; bias_source = ADCX140_MIC_BIAS_VAL_VREF;
...@@ -754,7 +755,7 @@ static int adcx140_codec_probe(struct snd_soc_component *component) ...@@ -754,7 +755,7 @@ static int adcx140_codec_probe(struct snd_soc_component *component)
return -EINVAL; return -EINVAL;
} }
ret = device_property_read_u8(adcx140->dev, "ti,vref-source", ret = device_property_read_u32(adcx140->dev, "ti,vref-source",
&vref_source); &vref_source);
if (ret) if (ret)
vref_source = ADCX140_MIC_BIAS_VREF_275V; vref_source = ADCX140_MIC_BIAS_VREF_275V;
...@@ -765,7 +766,7 @@ static int adcx140_codec_probe(struct snd_soc_component *component) ...@@ -765,7 +766,7 @@ static int adcx140_codec_probe(struct snd_soc_component *component)
return -EINVAL; return -EINVAL;
} }
bias_source |= vref_source; bias_cfg = bias_source << ADCX140_MIC_BIAS_SHIFT | vref_source;
ret = adcx140_reset(adcx140); ret = adcx140_reset(adcx140);
if (ret) if (ret)
...@@ -785,7 +786,7 @@ static int adcx140_codec_probe(struct snd_soc_component *component) ...@@ -785,7 +786,7 @@ static int adcx140_codec_probe(struct snd_soc_component *component)
ret = regmap_update_bits(adcx140->regmap, ADCX140_BIAS_CFG, ret = regmap_update_bits(adcx140->regmap, ADCX140_BIAS_CFG,
ADCX140_MIC_BIAS_VAL_MSK | ADCX140_MIC_BIAS_VAL_MSK |
ADCX140_MIC_BIAS_VREF_MSK, bias_source); ADCX140_MIC_BIAS_VREF_MSK, bias_cfg);
if (ret) if (ret)
dev_err(adcx140->dev, "setting MIC bias failed %d\n", ret); dev_err(adcx140->dev, "setting MIC bias failed %d\n", ret);
out: out:
......
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
#define ADCX140_MIC_BIAS_VAL_VREF_1096 1 #define ADCX140_MIC_BIAS_VAL_VREF_1096 1
#define ADCX140_MIC_BIAS_VAL_AVDD 6 #define ADCX140_MIC_BIAS_VAL_AVDD 6
#define ADCX140_MIC_BIAS_VAL_MSK GENMASK(6, 4) #define ADCX140_MIC_BIAS_VAL_MSK GENMASK(6, 4)
#define ADCX140_MIC_BIAS_SHIFT 4
#define ADCX140_MIC_BIAS_VREF_275V 0 #define ADCX140_MIC_BIAS_VREF_275V 0
#define ADCX140_MIC_BIAS_VREF_25V 1 #define ADCX140_MIC_BIAS_VREF_25V 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment