Skip to contentSkip to conversation

ASoC: davinci-mcasp: Fix overwriting of ahclkx

PATCH In review J.D. Schroeder 3 participants 3 messages Apr 25, 2016 – May 2, 2016

Subsystems (2)
Sound ASoC
lore
Share & tools
lore

J.D. Schroeder

author
#0 lore raw

PATCH 1/1 ASoC: davinci-mcasp: Fix overwriting of ahclkx

From: Jim Lodes <[email protected]>

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 <[email protected]>
Signed-off-by J.D. Schroeder <[email protected]>
---
 sound/soc/davinci/davinci-mcasp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/davinci/davinci-mcasp.c +1 -1
index e132498..a1197ad 100644
@@ -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:
Signature · 1 line
1.9.1
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · J.D. Schroeder

From: Jim Lodes <[email protected]>

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.

Acked-by Peter Ujfalusi <[email protected]>
Quoted 21 lines
Signed-off-by Jim Lodes <[email protected]>
Signed-off-by J.D. Schroeder <[email protected]>
---
 sound/soc/davinci/davinci-mcasp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/davinci/davinci-mcasp.c +1 -1
index e132498..a1197ad 100644
@@ -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:
Signature · 1 line
Péter
maintainer
#2 lore raw

Applied "ASoC: davinci-mcasp: Fix overwriting of ahclkx" to the asoc tree

In reply to J.D. Schroeder

The patch

ASoC: davinci-mcasp: Fix overwriting of ahclkx

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 823ecdd684e28d4e71686fc8787b6d31b1223382 Mon Sep 17 00:00:00 2001

From: Jim Lodes <[email protected]>
Date: Mon, 25 Apr 2016 11:08:10 -0500
Subject: [PATCH] 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 <[email protected]>
Signed-off-by J.D. Schroeder <[email protected]>
Acked-by Peter Ujfalusi <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/davinci/davinci-mcasp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/davinci/davinci-mcasp.c +1 -1
index e1324989bd6b..a1197ad023f6 100644
@@ -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:
Signature · 1 line
2.8.1