aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Lodes <jim.lodes@garmin.com>2016-04-25 12:08:10 -0400
committerMark Brown <broonie@kernel.org>2016-04-29 13:19:14 -0400
commit823ecdd684e28d4e71686fc8787b6d31b1223382 (patch)
treeb02ca7c246d4db038c6d4f7a9f17b37c914ce35f
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
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>
-rw-r--r--sound/soc/davinci/davinci-mcasp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index e1324989bd6b..a1197ad023f6 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -489,7 +489,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
489 mcasp_clr_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, AFSRE); 489 mcasp_clr_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, AFSRE);
490 490
491 mcasp_clr_bits(mcasp, DAVINCI_MCASP_PDIR_REG, 491 mcasp_clr_bits(mcasp, DAVINCI_MCASP_PDIR_REG,
492 ACLKX | AHCLKX | AFSX | ACLKR | AHCLKR | AFSR); 492 ACLKX | AFSX | ACLKR | AHCLKR | AFSR);
493 mcasp->bclk_master = 0; 493 mcasp->bclk_master = 0;
494 break; 494 break;
495 default: 495 default: