Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10867b32 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm5102: Revert manual speaker enable 



The OUT4L and OUT4R widgets are not registered PRE_PMU or POST_PMD
events, as such the manual speaker enable on wm5102 does not actually
ever run. Furthermore since the issue actually only affected rev B of
the silicon which never shipped in volume, simply remove the work around
from the code.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a3178a3e

sound/soc/codecs/arizona.c

+0 −42
Original line number Diff line number Diff line
@@ -85,30 +85,9 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct arizona *arizona = dev_get_drvdata(codec->dev->parent);

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	bool manual_ena = false;

	int val;



	switch (arizona->type) {

	case WM5102:

		switch (arizona->rev) {

		case 0:

			break;

		default:

			manual_ena = true;

			break;

		}

	default:

		break;

	}



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		if (!priv->spk_ena && manual_ena) {

			regmap_write_async(arizona->regmap, 0x4f5, 0x25a);

			priv->spk_ena_pending = true;

		}

		break;

	case SND_SOC_DAPM_POST_PMU:

		val = snd_soc_read(codec, ARIZONA_INTERRUPT_RAW_STATUS_3);

		if (val & ARIZONA_SPK_OVERHEAT_STS) {
@@ -120,33 +99,12 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w, 
		regmap_update_bits_async(arizona->regmap,

					 ARIZONA_OUTPUT_ENABLES_1,

					 1 << w->shift, 1 << w->shift);



		if (priv->spk_ena_pending) {

			msleep(75);

			regmap_write_async(arizona->regmap, 0x4f5, 0xda);

			priv->spk_ena_pending = false;

			priv->spk_ena++;

		}

		break;

	case SND_SOC_DAPM_PRE_PMD:

		if (manual_ena) {

			priv->spk_ena--;

			if (!priv->spk_ena)

				regmap_write_async(arizona->regmap,

						   0x4f5, 0x25a);

		}



		regmap_update_bits_async(arizona->regmap,

					 ARIZONA_OUTPUT_ENABLES_1,

					 1 << w->shift, 0);

		break;

	case SND_SOC_DAPM_POST_PMD:

		if (manual_ena) {

			if (!priv->spk_ena)

				regmap_write_async(arizona->regmap,

						   0x4f5, 0x0da);

		}

		break;

	default:

		break;

	}

sound/soc/codecs/arizona.h

+0 −3
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ struct arizona_priv { 
	unsigned int out_down_pending;

	unsigned int out_down_delay;



	unsigned int spk_ena:2;

	unsigned int spk_ena_pending:1;



	unsigned int dvfs_reqs;

	struct mutex dvfs_lock;

	bool dvfs_cached;