Unverified Commit 09273f38 authored by Martin Povišer's avatar Martin Povišer Committed by Mark Brown
Browse files

ASoC: tas2764: Drop conflicting set_bias_level power setting 



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.

(This mirrors commit c8a6ae3fe1c8 ("ASoC: tas2770: Drop conflicting
set_bias_level power setting") which was a fix to the tas2770 driver.)

Fixes: 827ed8a0 ("ASoC: tas2764: Add the driver for the TAS2764")
Signed-off-by: default avatarMartin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/20220825140241.53963-3-povik+lin@cutebit.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 23204d92

sound/soc/codecs/tas2764.c

+0 −33
Original line number Diff line number Diff line
@@ -50,38 +50,6 @@ static void tas2764_reset(struct tas2764_priv *tas2764) 
	usleep_range(1000, 2000);

}



static int tas2764_set_bias_level(struct snd_soc_component *component,

				 enum snd_soc_bias_level level)

{

	struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);



	switch (level) {

	case SND_SOC_BIAS_ON:

		snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,

					      TAS2764_PWR_CTRL_MASK,

					      TAS2764_PWR_CTRL_ACTIVE);

		break;

	case SND_SOC_BIAS_STANDBY:

	case SND_SOC_BIAS_PREPARE:

		snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,

					      TAS2764_PWR_CTRL_MASK,

					      TAS2764_PWR_CTRL_MUTE);

		break;

	case SND_SOC_BIAS_OFF:

		snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,

					      TAS2764_PWR_CTRL_MASK,

					      TAS2764_PWR_CTRL_SHUTDOWN);

		break;



	default:

		dev_err(tas2764->dev,

				"wrong power level setting %d\n", level);

		return -EINVAL;

	}



	return 0;

}



#ifdef CONFIG_PM

static int tas2764_codec_suspend(struct snd_soc_component *component)

{
@@ -549,7 +517,6 @@ static const struct snd_soc_component_driver soc_component_driver_tas2764 = { 
	.probe			= tas2764_codec_probe,

	.suspend		= tas2764_codec_suspend,

	.resume			= tas2764_codec_resume,

	.set_bias_level		= tas2764_set_bias_level,

	.controls		= tas2764_snd_controls,

	.num_controls		= ARRAY_SIZE(tas2764_snd_controls),

	.dapm_widgets		= tas2764_dapm_widgets,