aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-10-08 13:40:20 -0400
committerPaul Walmsley <paul@pwsan.com>2010-10-08 13:40:20 -0400
commit425925dd750acc17234977decfda1f9cc223389a (patch)
tree32ba82f1b03223d45c7e71cb6b2c3fad55ffb608 /arch/arm/mach-omap2
parent6041c27f51f237b59ea0838c33e08223cf98e43e (diff)
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>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/mcbsp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index eba9fa14a9de..f6b772e5381f 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -34,7 +34,7 @@ void omap2_mcbsp1_mux_clkr_src(u8 mux)
34 34
35 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); 35 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
36 if (mux == CLKR_SRC_CLKR) 36 if (mux == CLKR_SRC_CLKR)
37 v &= OMAP2_MCBSP1_CLKR_MASK; 37 v &= ~OMAP2_MCBSP1_CLKR_MASK;
38 else if (mux == CLKR_SRC_CLKX) 38 else if (mux == CLKR_SRC_CLKX)
39 v |= OMAP2_MCBSP1_CLKR_MASK; 39 v |= OMAP2_MCBSP1_CLKR_MASK;
40 omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0); 40 omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
@@ -47,7 +47,7 @@ void omap2_mcbsp1_mux_fsr_src(u8 mux)
47 47
48 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); 48 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
49 if (mux == FSR_SRC_FSR) 49 if (mux == FSR_SRC_FSR)
50 v &= OMAP2_MCBSP1_FSR_MASK; 50 v &= ~OMAP2_MCBSP1_FSR_MASK;
51 else if (mux == FSR_SRC_FSX) 51 else if (mux == FSR_SRC_FSX)
52 v |= OMAP2_MCBSP1_FSR_MASK; 52 v |= OMAP2_MCBSP1_FSR_MASK;
53 omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0); 53 omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);