Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 425925dd authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Paul Walmsley
Browse files

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: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
parent 6041c27f

arch/arm/mach-omap2/mcbsp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ void omap2_mcbsp1_mux_clkr_src(u8 mux) 




	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);

	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);

	if (mux == CLKR_SRC_CLKR)

	if (mux == CLKR_SRC_CLKR)

		v &= OMAP2_MCBSP1_CLKR_MASK;

		v &= ~OMAP2_MCBSP1_CLKR_MASK;

	else if (mux == CLKR_SRC_CLKX)

	else if (mux == CLKR_SRC_CLKX)

		v |= OMAP2_MCBSP1_CLKR_MASK;

		v |= OMAP2_MCBSP1_CLKR_MASK;

	omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);

	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);

	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);

	if (mux == FSR_SRC_FSR)

	if (mux == FSR_SRC_FSR)

		v &= OMAP2_MCBSP1_FSR_MASK;

		v &= ~OMAP2_MCBSP1_FSR_MASK;

	else if (mux == FSR_SRC_FSX)

	else if (mux == FSR_SRC_FSX)

		v |= OMAP2_MCBSP1_FSR_MASK;

		v |= OMAP2_MCBSP1_FSR_MASK;

	omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);

	omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);