Skip to content

Commit

Permalink
OMAP: McBSP: Fix CLKR and FSR signal muxing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jarkko Nikula authored and Paul Walmsley committed Oct 8, 2010
1 parent 6041c27 commit 425925d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-omap2/mcbsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ void omap2_mcbsp1_mux_clkr_src(u8 mux)

v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
if (mux == CLKR_SRC_CLKR)
v &= OMAP2_MCBSP1_CLKR_MASK;
v &= ~OMAP2_MCBSP1_CLKR_MASK;
else if (mux == CLKR_SRC_CLKX)
v |= OMAP2_MCBSP1_CLKR_MASK;
omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
Expand All @@ -47,7 +47,7 @@ void omap2_mcbsp1_mux_fsr_src(u8 mux)

v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
if (mux == FSR_SRC_FSR)
v &= OMAP2_MCBSP1_FSR_MASK;
v &= ~OMAP2_MCBSP1_FSR_MASK;
else if (mux == FSR_SRC_FSX)
v |= OMAP2_MCBSP1_FSR_MASK;
omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
Expand Down

0 comments on commit 425925d

Please sign in to comment.