Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-22 16:03:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: max98390: Remove unnecessary amp on/off conrtol

Browse Source 
The Amp is already control in userspace before trigger calibrate function.
Remove unnecessary control in calibrate function and
add condition to check calibration is ready.

Signed-off-by: Steve Lee <steve.lee.analog@gmail.com>
Link: https://lore.kernel.org/r/20220908060359.13606-1-steve.lee.analog@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Steve Lee 2022-09-08 15:03:59 +09:00 committed by Mark Brown
parent e0d38f88e9
commit 6ac246105b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/codecs/max98390.c
View File

@ -635,10 +635,19 @@ static int max98390_dsm_calib_get(struct snd_kcontrol *kcontrol,
static int max98390_dsm_calib_put(struct snd_kcontrol *kcontrol, static int max98390_dsm_calib_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
unsigned int val;
struct snd_soc_component *component = struct snd_soc_component *component =
snd_soc_kcontrol_component(kcontrol); snd_soc_kcontrol_component(kcontrol);
struct max98390_priv *max98390 =
snd_soc_component_get_drvdata(component);
max98390_dsm_calibrate(component); regmap_read(max98390->regmap, MAX98390_R23FF_GLOBAL_EN, &val);
if (val == 0x1)
max98390_dsm_calibrate(component);
else {
dev_err(component->dev, "AMP is not ready to run calibration\n");
return -ECANCELED;
}
return 0; return 0;
} }
@ -826,9 +835,6 @@ static int max98390_dsm_calibrate(struct snd_soc_component *component)
struct max98390_priv *max98390 = struct max98390_priv *max98390 =
snd_soc_component_get_drvdata(component); snd_soc_component_get_drvdata(component);
regmap_write(max98390->regmap, MAX98390_R203A_AMP_EN, 0x81);
regmap_write(max98390->regmap, MAX98390_R23FF_GLOBAL_EN, 0x01);
regmap_read(max98390->regmap, regmap_read(max98390->regmap,
THERMAL_RDC_RD_BACK_BYTE1, &rdc); THERMAL_RDC_RD_BACK_BYTE1, &rdc);
regmap_read(max98390->regmap, regmap_read(max98390->regmap,
@ -847,9 +853,6 @@ static int max98390_dsm_calibrate(struct snd_soc_component *component)
dev_info(component->dev, "rdc resistance about %d.%02d ohm, reg=0x%X temp reg=0x%X\n", dev_info(component->dev, "rdc resistance about %d.%02d ohm, reg=0x%X temp reg=0x%X\n",
rdc_integer, rdc_factor, rdc_cal_result, temp); rdc_integer, rdc_factor, rdc_cal_result, temp);
regmap_write(max98390->regmap, MAX98390_R23FF_GLOBAL_EN, 0x00);
regmap_write(max98390->regmap, MAX98390_R203A_AMP_EN, 0x80);
return 0; return 0;
} }