From patchwork Wed Oct 6 05:50:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 234761 X-Patchwork-Delegate: paul@pwsan.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o965oPW9017163 for ; Wed, 6 Oct 2010 05:50:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756928Ab0JFFuX (ORCPT ); Wed, 6 Oct 2010 01:50:23 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:64717 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756904Ab0JFFuU (ORCPT ); Wed, 6 Oct 2010 01:50:20 -0400 Received: by mail-ew0-f46.google.com with SMTP id 23so2731852ewy.19 for ; Tue, 05 Oct 2010 22:50:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=cZBgyM0aWMS4loPUZOuRXwtcKxzQxNhVZqqoyt1b9q8=; b=IX3+FhcyUywchQK1vLS7L/WuiQmwKjW7bYUL2TzclE6QA/qdQi+Yxwa+QP28tg0x5p nnze2PenksU8j33wBdZA8lwi0xqS8knXPtbRU6Wjl8lha9oLzSJBecMDmIjucvs3rsY9 i6qgMd34PNK7eUrZRrSSTuCs3I4/njpxOkXGg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=TPs+TyL8morrw96+F3SlX4PoMohA+hjqAns4GjJKUTPogwtXa7i6ZauojH9fDXXBcR FPNHmp1O6ANNXeBPssc7sgpwTncF5ydmReXSRgwYjgzTShA04nhxrWbsE5aqQkY4R5lF BVrCPXq9NpwZALNswfjSbU+JgVSpF5lKbIVX8= Received: by 10.213.15.202 with SMTP id l10mr258030eba.72.1286344219472; Tue, 05 Oct 2010 22:50:19 -0700 (PDT) Received: from localhost (host-94-101-4-66.igua.fi [94.101.4.66]) by mx.google.com with ESMTPS id a48sm846178eei.19.2010.10.05.22.50.17 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 05 Oct 2010 22:50:18 -0700 (PDT) From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: Tony Lindgren , Paul Walmsley , linux-arm-kernel@lists.infradead.org, Jarkko Nikula Subject: [PATCHv2 1/3] OMAP: McBSP: Fix CLKR and FSR signal muxing Date: Wed, 6 Oct 2010 08:50:40 +0300 Message-Id: <1286344242-430-2-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1286344242-430-1-git-send-email-jhnikula@gmail.com> References: <1286344242-430-1-git-send-email-jhnikula@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Oct 2010 05:50:25 +0000 (UTC) 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);