Commit 823ecdd6 authored Apr 25, 2016 by Jim Lodes Committed by Mark Brown Apr 29, 2016

ASoC: davinci-mcasp: Fix overwriting of ahclkx



The mcasp davinci_mcasp_set_dai_fmt function was overriding ahclkx
input/output status that had already been set by the
davinci_mcasp_set_sysclk function. This commit removes clearing
of the ahclkx input/output status from davinci_mcasp_set_dai_fmt.

Signed-off-by: Jim Lodes <jim.lodes@garmin.com>
Signed-off-by: J.D. Schroeder <jay.schroeder@garmin.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent f55532a0

sound/soc/davinci/davinci-mcasp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -489,7 +489,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
		mcasp_clr_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, AFSRE);

		mcasp_clr_bits(mcasp, DAVINCI_MCASP_PDIR_REG,
		ACLKX \| AHCLKX \| AFSX \| ACLKR \| AHCLKR \| AFSR);
		ACLKX \| AFSX \| ACLKR \| AHCLKR \| AFSR);
		mcasp->bclk_master = 0;
		break;
		default: