xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: tas2770: Drop conflicting set_bias_level power setting

Browse Source 
commit 482c23fbc7e9bf5a7a74defd0735d5346215db58 upstream.

The driver is setting the PWR_CTRL field in both the set_bias_level
callback and on DAPM events of the DAC widget (and also in the
mute_stream method). Drop the set_bias_level callback altogether as the
power setting it does is in conflict with the other code paths.

Fixes: 1a476abc72 ("tas2770: add tas2770 smart PA kernel driver")
Signed-off-by: Martin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/20220808141246.5749-4-povik+lin@cutebit.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin Povišer
2022-08-08 16:12:45 +02:00
committed by Greg Kroah-Hartman
parent dffe1c4780
commit 353cc4cb97
1 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sound/soc/codecs/tas2770.c
View File

@@ -46,38 +46,6 @@ static void tas2770_reset(struct tas2770_priv *tas2770)
usleep_range(1000, 2000); usleep_range(1000, 2000);
} }
static int tas2770_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level)
{
struct tas2770_priv *tas2770 =
snd_soc_component_get_drvdata(component);
switch (level) {
case SND_SOC_BIAS_ON:
snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,
TAS2770_PWR_CTRL_MASK,
TAS2770_PWR_CTRL_ACTIVE);
break;
case SND_SOC_BIAS_STANDBY:
case SND_SOC_BIAS_PREPARE:
snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,
TAS2770_PWR_CTRL_MASK,
TAS2770_PWR_CTRL_MUTE);
break;
case SND_SOC_BIAS_OFF:
snd_soc_component_update_bits(component, TAS2770_PWR_CTRL,
TAS2770_PWR_CTRL_MASK,
TAS2770_PWR_CTRL_SHUTDOWN);
break;
default:
dev_err(tas2770->dev, "wrong power level setting %d\n", level);
return -EINVAL;
}
return 0;
}
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int tas2770_codec_suspend(struct snd_soc_component *component) static int tas2770_codec_suspend(struct snd_soc_component *component)
{ {
@@ -555,7 +523,6 @@ static const struct snd_soc_component_driver soc_component_driver_tas2770 = {
.probe = tas2770_codec_probe, .probe = tas2770_codec_probe,
.suspend = tas2770_codec_suspend, .suspend = tas2770_codec_suspend,
.resume = tas2770_codec_resume, .resume = tas2770_codec_resume,
.set_bias_level = tas2770_set_bias_level,
.controls = tas2770_snd_controls, .controls = tas2770_snd_controls,
.num_controls = ARRAY_SIZE(tas2770_snd_controls), .num_controls = ARRAY_SIZE(tas2770_snd_controls),
.dapm_widgets = tas2770_dapm_widgets, .dapm_widgets = tas2770_dapm_widgets,