Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 425925dd750acc17234977decfda1f9cc223389a

Authored by Jarkko Nikula
Committed by Paul Walmsley
1 parent 6041c27f51
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

OMAP: McBSP: Fix CLKR and FSR signal muxing 

Fix bit clear. Now it clears all other bits than mask bit where it should
clear only it.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

arch/arm/mach-omap2/mcbsp.c
Diff comments   View file @ 425925d
... ... @@ -34,7 +34,7 @@
34 34  
35 35 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
36 36 if (mux == CLKR_SRC_CLKR)
37   - v &= OMAP2_MCBSP1_CLKR_MASK;
  37 + v &= ~OMAP2_MCBSP1_CLKR_MASK;
38 38 else if (mux == CLKR_SRC_CLKX)
39 39 v |= OMAP2_MCBSP1_CLKR_MASK;
40 40 omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
... ... @@ -47,7 +47,7 @@
47 47  
48 48 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
49 49 if (mux == FSR_SRC_FSR)
50   - v &= OMAP2_MCBSP1_FSR_MASK;
  50 + v &= ~OMAP2_MCBSP1_FSR_MASK;
51 51 else if (mux == FSR_SRC_FSX)
52 52 v |= OMAP2_MCBSP1_FSR_MASK;
53 53 omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);