Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'asoc/fix/tpa6130a2' into asoc-linus

Browse source
This commit is contained in:
Mark Brown 2016-09-29 12:43:55 -07:00
commit e4cf86a35c
1 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
sound/soc/codecs/tpa6130a2.c
View file

@ -52,7 +52,7 @@ struct tpa6130a2_data {
static int tpa6130a2_power(struct tpa6130a2_data *data, bool enable) static int tpa6130a2_power(struct tpa6130a2_data *data, bool enable)
{ {
int ret; int ret = 0, ret2;
if (enable) { if (enable) {
ret = regulator_enable(data->supply); ret = regulator_enable(data->supply);
@ -64,20 +64,34 @@ static int tpa6130a2_power(struct tpa6130a2_data *data, bool enable)
/* Power on */ /* Power on */
if (data->power_gpio >= 0) if (data->power_gpio >= 0)
gpio_set_value(data->power_gpio, 1); gpio_set_value(data->power_gpio, 1);
/* Sync registers */
regcache_cache_only(data->regmap, false);
ret = regcache_sync(data->regmap);
if (ret != 0) {
dev_err(data->dev,
"Failed to sync registers: %d\n", ret);
goto regcache_sync_failed;
}
} else { } else {
/* Powered off device does not retain registers. While device
* is off, any register updates (i.e. volume changes) should
* happen in cache only.
*/
regcache_mark_dirty(data->regmap);
regcache_sync_failed:
regcache_cache_only(data->regmap, true);
/* Power off */ /* Power off */
if (data->power_gpio >= 0) if (data->power_gpio >= 0)
gpio_set_value(data->power_gpio, 0); gpio_set_value(data->power_gpio, 0);
ret = regulator_disable(data->supply); ret2 = regulator_disable(data->supply);
if (ret != 0) { if (ret2 != 0) {
dev_err(data->dev, dev_err(data->dev,
"Failed to disable supply: %d\n", ret); "Failed to disable supply: %d\n", ret2);
return ret; return ret ? ret : ret2;
} }
/* device regs does not match the cache state anymore */
regcache_mark_dirty(data->regmap);
} }
return ret; return ret;
@ -88,25 +102,14 @@ static int tpa6130a2_power_event(struct snd_soc_dapm_widget *w,
{ {
struct snd_soc_component *c = snd_soc_dapm_to_component(w->dapm); struct snd_soc_component *c = snd_soc_dapm_to_component(w->dapm);
struct tpa6130a2_data *data = snd_soc_component_get_drvdata(c); struct tpa6130a2_data *data = snd_soc_component_get_drvdata(c);
int ret;
/* before widget power up */
if (SND_SOC_DAPM_EVENT_ON(event)) { if (SND_SOC_DAPM_EVENT_ON(event)) {
/* Turn on the chip */ /* Before widget power up: turn chip on, sync registers */
tpa6130a2_power(data, true); return tpa6130a2_power(data, true);
/* Sync the registers */
ret = regcache_sync(data->regmap);
if (ret < 0) {
dev_err(c->dev, "Failed to initialize chip\n");
tpa6130a2_power(data, false);
return ret;
}
/* after widget power down */
} else { } else {
tpa6130a2_power(data, false); /* After widget power down: turn chip off */
return tpa6130a2_power(data, false);
} }
return 0;
} }
/* /*