From: Jarkko Nikula <jhnikula@gmail.com>
To: linux-omap@vger.kernel.org
Cc: Tony Lindgren <tony@atomide.com>,
Jarkko Nikula <jhnikula@gmail.com>,
Paul Walmsley <paul@pwsan.com>
Subject: [PATCH 1/3] OMAP: McBSP: Fix CLKR and FSR signal muxing
Date: Tue, 5 Oct 2010 15:29:33 +0300 [thread overview]
Message-ID: <1286281775-27692-1-git-send-email-jhnikula@gmail.com> (raw)
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>
Cc: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/mcbsp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index eba9fa1..f6b772e 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)
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);
--
1.7.1
next reply other threads:[~2010-10-05 12:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-05 12:29 Jarkko Nikula [this message]
2010-10-05 12:29 ` [PATCH 2/3] OMAP: McBSP: Swap CLKS source definition Jarkko Nikula
2010-10-05 15:11 ` Paul Walmsley
2010-10-06 5:44 ` Peter Ujfalusi
2010-10-05 12:29 ` [PATCH 3/3] OMAP: McBSP: Remove null omap44xx ops comment Jarkko Nikula
2010-10-05 15:12 ` Paul Walmsley
2010-10-06 5:43 ` Peter Ujfalusi
2010-10-05 15:11 ` [PATCH 1/3] OMAP: McBSP: Fix CLKR and FSR signal muxing Paul Walmsley
2010-10-05 17:41 ` Tony Lindgren
2010-10-06 5:43 ` Peter Ujfalusi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1286281775-27692-1-git-send-email-jhnikula@gmail.com \
--to=jhnikula@gmail.com \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox