Commit a975873a authored by Daniel Mack's avatar Daniel Mack Committed by Mark Brown

ASoC: tas5086: fix Mid-Z implementation

It turns out that the TAS5086 doesn't like channel start parts to be
empty, and if all channels are configured to Mid-Z, part 1 has to be
used.
Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 9f24dc87
...@@ -721,7 +721,7 @@ static int tas5086_probe(struct snd_soc_codec *codec) ...@@ -721,7 +721,7 @@ static int tas5086_probe(struct snd_soc_codec *codec)
{ {
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
int charge_period = 1300000; /* hardware default is 1300 ms */ int charge_period = 1300000; /* hardware default is 1300 ms */
u8 pwm_start = TAS5086_PWM_START_CHANNEL_MASK; u8 pwm_start_mid_z = 0;
int i, ret; int i, ret;
if (of_match_device(of_match_ptr(tas5086_dt_ids), codec->dev)) { if (of_match_device(of_match_ptr(tas5086_dt_ids), codec->dev)) {
...@@ -735,16 +735,19 @@ static int tas5086_probe(struct snd_soc_codec *codec) ...@@ -735,16 +735,19 @@ static int tas5086_probe(struct snd_soc_codec *codec)
"ti,mid-z-channel-%d", i + 1); "ti,mid-z-channel-%d", i + 1);
if (of_get_property(of_node, name, NULL) != NULL) if (of_get_property(of_node, name, NULL) != NULL)
pwm_start &= ~(1 << i); pwm_start_mid_z |= 1 << i;
} }
} }
/* /*
* Configure 'part 2' of the PWM starts to always use MID-Z, and tell * If any of the channels is configured to start in Mid-Z mode,
* all configured mid-z channels to start start under 'part 2'. * configure 'part 1' of the PWM starts to use Mid-Z, and tell
* all configured mid-z channels to start start under 'part 1'.
*/ */
if (pwm_start_mid_z)
regmap_write(priv->regmap, TAS5086_PWM_START, regmap_write(priv->regmap, TAS5086_PWM_START,
TAS5086_PWM_START_MIDZ_FOR_START_2 | pwm_start); TAS5086_PWM_START_MIDZ_FOR_START_1 |
pwm_start_mid_z);
/* lookup and set split-capacitor charge period */ /* lookup and set split-capacitor charge period */
if (charge_period == 0) { if (charge_period == 0) {
......
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