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>

diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index eba9fa14a9debbfb212aefe11df09191989fa192..f6b772e5381f2335801607938c86f457946f79d2 100644 (file)
--- 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)
 
        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);
@@ -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);