Unverified Commit cdcdb008 authored by Mark Brown's avatar Mark Brown
Browse files

Untested TAS2562 power setting fixes 

Merge series from Martin Povišer <povik+lin@cutebit.org>:

The tas2562 driver does the same thing with the setting of PWR_CTRL
field as the tas2764/tas2770 drivers were doing.
Link: https://lore.kernel.org/alsa-devel/20220808141246.5749-1-povik+lin@cutebit.org/T/#t
Link: https://lore.kernel.org/alsa-devel/20220825140241.53963-1-povik+lin@cutebit.org/T/#t

These are blindly written patches without testing since I don't have
the hardware. (I even tried TI's formal sample request program but
was refused there. CCing @ti.com addresses I found on other series
recently submitted.)
parents 5176ee64 2848d34c

sound/soc/codecs/tas2562.c

+29 −61
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ struct tas2562_data { 
	int i_sense_slot;

	int volume_lvl;

	int model_id;

	bool dac_powered;

	bool unmuted;

};



enum tas256x_model {
@@ -63,39 +65,6 @@ enum tas256x_model { 
	TAS2110,

};



static int tas2562_set_bias_level(struct snd_soc_component *component,

				 enum snd_soc_bias_level level)

{

	struct tas2562_data *tas2562 =

			snd_soc_component_get_drvdata(component);



	switch (level) {

	case SND_SOC_BIAS_ON:

		snd_soc_component_update_bits(component,

			TAS2562_PWR_CTRL,

			TAS2562_MODE_MASK, TAS2562_ACTIVE);

		break;

	case SND_SOC_BIAS_STANDBY:

	case SND_SOC_BIAS_PREPARE:

		snd_soc_component_update_bits(component,

			TAS2562_PWR_CTRL,

			TAS2562_MODE_MASK, TAS2562_MUTE);

		break;

	case SND_SOC_BIAS_OFF:

		snd_soc_component_update_bits(component,

			TAS2562_PWR_CTRL,

			TAS2562_MODE_MASK, TAS2562_SHUTDOWN);

		break;



	default:

		dev_err(tas2562->dev,

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

		return -EINVAL;

	}



	return 0;

}



static int tas2562_set_samplerate(struct tas2562_data *tas2562, int samplerate)

{

	int samp_rate;
@@ -384,30 +353,43 @@ static int tas2562_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	return 0;

}



static int tas2562_update_pwr_ctrl(struct tas2562_data *tas2562)

{

	struct snd_soc_component *component = tas2562->component;

	unsigned int val;

	int ret;



	if (tas2562->dac_powered)

		val = tas2562->unmuted ?

			TAS2562_ACTIVE : TAS2562_MUTE;

	else

		val = TAS2562_SHUTDOWN;



	ret = snd_soc_component_update_bits(component, TAS2562_PWR_CTRL,

					    TAS2562_MODE_MASK, val);

	if (ret < 0)

		return ret;



	return 0;

}



static int tas2562_mute(struct snd_soc_dai *dai, int mute, int direction)

{

	struct snd_soc_component *component = dai->component;

	struct tas2562_data *tas2562 = snd_soc_component_get_drvdata(dai->component);



	return snd_soc_component_update_bits(component, TAS2562_PWR_CTRL,

					     TAS2562_MODE_MASK,

					     mute ? TAS2562_MUTE : 0);

	tas2562->unmuted = !mute;

	return tas2562_update_pwr_ctrl(tas2562);

}



static int tas2562_codec_probe(struct snd_soc_component *component)

{

	struct tas2562_data *tas2562 = snd_soc_component_get_drvdata(component);

	int ret;



	tas2562->component = component;



	if (tas2562->sdz_gpio)

		gpiod_set_value_cansleep(tas2562->sdz_gpio, 1);



	ret = snd_soc_component_update_bits(component, TAS2562_PWR_CTRL,

					    TAS2562_MODE_MASK, TAS2562_MUTE);

	if (ret < 0)

		return ret;



	return 0;

}
@@ -461,30 +443,18 @@ static int tas2562_dac_event(struct snd_soc_dapm_widget *w, 


	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		ret = snd_soc_component_update_bits(component,

			TAS2562_PWR_CTRL,

			TAS2562_MODE_MASK,

			TAS2562_MUTE);

		if (ret)

			goto end;

		tas2562->dac_powered = true;

		ret = tas2562_update_pwr_ctrl(tas2562);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		ret = snd_soc_component_update_bits(component,

			TAS2562_PWR_CTRL,

			TAS2562_MODE_MASK,

			TAS2562_SHUTDOWN);

		if (ret)

			goto end;

		tas2562->dac_powered = false;

		ret = tas2562_update_pwr_ctrl(tas2562);

		break;

	default:

		dev_err(tas2562->dev, "Not supported evevt\n");

		return -EINVAL;

	}



end:

	if (ret < 0)

		return ret;



	return 0;

}
@@ -579,7 +549,6 @@ static const struct snd_soc_component_driver soc_component_dev_tas2110 = { 
	.probe			= tas2562_codec_probe,

	.suspend		= tas2562_suspend,

	.resume			= tas2562_resume,

	.set_bias_level		= tas2562_set_bias_level,

	.controls		= tas2562_snd_controls,

	.num_controls		= ARRAY_SIZE(tas2562_snd_controls),

	.dapm_widgets		= tas2110_dapm_widgets,
@@ -618,7 +587,6 @@ static const struct snd_soc_component_driver soc_component_dev_tas2562 = { 
	.probe			= tas2562_codec_probe,

	.suspend		= tas2562_suspend,

	.resume			= tas2562_resume,

	.set_bias_level		= tas2562_set_bias_level,

	.controls		= tas2562_snd_controls,

	.num_controls		= ARRAY_SIZE(tas2562_snd_controls),

	.dapm_widgets		= tas2562_dapm_widgets,