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

Commit 7e28fd46 authored by Adam Thomson's avatar Adam Thomson Committed by Mark Brown
Browse files

ASoC: da7213: Default PC counter to free-running when DAI disabled 



Currently PC counter is always synchronised to DAI which means that
when the DAI is disabled, features such as ALC calibration cannot
be executed successfully. This patch makes sure that when the DAI
is disabled, PC counter is set to free-running.

Signed-off-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d575b0b0

sound/soc/codecs/da7213.c

+13 −0
Original line number Diff line number Diff line
@@ -746,6 +746,10 @@ static int da7213_dai_event(struct snd_soc_dapm_widget *w, 
					    DA7213_DAI_CLK_EN_MASK,

					    DA7213_DAI_CLK_EN_MASK);



		/* PC synchronised to DAI */

		snd_soc_update_bits(codec, DA7213_PC_COUNT,

				    DA7213_PC_FREERUN_MASK, 0);



		/* Slave mode, if SRM not enabled no need for status checks */

		pll_ctrl = snd_soc_read(codec, DA7213_PLL_CTRL);

		if (!(pll_ctrl & DA7213_PLL_SRM_EN))
@@ -767,6 +771,11 @@ static int da7213_dai_event(struct snd_soc_dapm_widget *w, 


		return 0;

	case SND_SOC_DAPM_POST_PMD:

		/* PC free-running */

		snd_soc_update_bits(codec, DA7213_PC_COUNT,

				    DA7213_PC_FREERUN_MASK,

				    DA7213_PC_FREERUN_MASK);



		/* Disable DAI clks if in master mode */

		if (da7213->master)

			snd_soc_update_bits(codec, DA7213_DAI_CLK_MODE,
@@ -1599,6 +1608,10 @@ static int da7213_probe(struct snd_soc_codec *codec) 
	/* Default to using SRM for slave mode */

	da7213->srm_en = true;



	/* Default PC counter to free-running */

	snd_soc_update_bits(codec, DA7213_PC_COUNT, DA7213_PC_FREERUN_MASK,

			    DA7213_PC_FREERUN_MASK);



	/* Enable all Gain Ramps */

	snd_soc_update_bits(codec, DA7213_AUX_L_CTRL,

			    DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);

sound/soc/codecs/da7213.h

+3 −0
Original line number Diff line number Diff line
@@ -413,6 +413,9 @@ 
#define DA7213_DMIC_CLK_RATE_SHIFT				2

#define DA7213_DMIC_CLK_RATE_MASK				(0x1 << 2)



/* DA7213_PC_COUNT = 0x94 */

#define DA7213_PC_FREERUN_MASK					(0x1 << 0)



/* DA7213_DIG_CTRL = 0x99 */

#define DA7213_DAC_L_INV_SHIFT					3

#define DA7213_DAC_R_INV_SHIFT					7