diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-09-17 19:59:21 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-09-17 19:59:21 +0300 |
commit | 196f4eeeb78f53e0a598db8f9408b6f8b270c355 (patch) | |
tree | e86b90621b6693954b5314e622a2980789b879e3 /sound/soc/codecs/max98373.c | |
parent | c3b55e2ec9c76e7a0de2a0b1dc851fdc9440385b (diff) | |
parent | 75383f8d39d4c0fb96083dd460b7b139fbdac492 (diff) | |
download | linux-196f4eeeb78f53e0a598db8f9408b6f8b270c355.tar.xz |
Merge tag 'asoc-v4.19-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.19
This is the usual set of small fixes scatterd around various drivers,
plus one fix for DAPM and a UAPI build fix. There's not a huge amount
that stands out here relative to anything else.
Diffstat (limited to 'sound/soc/codecs/max98373.c')
-rw-r--r-- | sound/soc/codecs/max98373.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c index 92b7125ea169..1093f766d0d2 100644 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c @@ -520,6 +520,7 @@ static bool max98373_volatile_reg(struct device *dev, unsigned int reg) { switch (reg) { case MAX98373_R2000_SW_RESET ... MAX98373_R2009_INT_FLAG3: + case MAX98373_R203E_AMP_PATH_GAIN: case MAX98373_R2054_MEAS_ADC_PVDD_CH_READBACK: case MAX98373_R2055_MEAS_ADC_THERM_CH_READBACK: case MAX98373_R20B6_BDE_CUR_STATE_READBACK: @@ -729,6 +730,7 @@ static int max98373_probe(struct snd_soc_component *component) /* Software Reset */ regmap_write(max98373->regmap, MAX98373_R2000_SW_RESET, MAX98373_SOFT_RESET); + usleep_range(10000, 11000); /* IV default slot configuration */ regmap_write(max98373->regmap, @@ -817,6 +819,7 @@ static int max98373_resume(struct device *dev) regmap_write(max98373->regmap, MAX98373_R2000_SW_RESET, MAX98373_SOFT_RESET); + usleep_range(10000, 11000); regcache_cache_only(max98373->regmap, false); regcache_sync(max98373->regmap); return 0; |