From patchwork Fri Mar 29 16:32:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Fritz X-Patchwork-Id: 2366121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 564CC3FD40 for ; Fri, 29 Mar 2013 16:34:52 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ULcDv-0005Zf-Ju; Fri, 29 Mar 2013 16:32:15 +0000 Received: from mail-ea0-x22c.google.com ([2a00:1450:4013:c01::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ULcDr-0005ZA-Vt for linux-arm-kernel@lists.infradead.org; Fri, 29 Mar 2013 16:32:12 +0000 Received: by mail-ea0-f172.google.com with SMTP id z7so289339eaf.31 for ; Fri, 29 Mar 2013 09:32:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:subject:from:to:cc:in-reply-to:references:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=tIyACLTQTHA0bsev6pL+AcWSzCBytijZlsVLGVSTw34=; b=u7uQsT/jNz8CZ9+3aGn+NyArD6rSXGSuINnHLiPcBh+YIm8nKvVROYK4nxdvvia5V6 jC3Uyt09DOs45gHhRdpobC4CbjlZQta0N9I3mroWm90JnZoW1xUtrRylJm7S2VXQpsqa 1z5nJgQGcgl9U2p0NuJjL2WePWcH+ppK0u1vX3VxPAEEMwwyC85Tma8vQKqppenz0UlI G1I3JeL2HPU0IPjyB6yrmomrYco9329XOlU64tsapFFHOvs5O+QT1ZDdrKHrd4fxKTN5 2l6wXKwG/Cw3eLusAZvnkvig8rMvpLUJ4/DaEjDxkRv3nBspINVc3jRpfvOHLfVHnCnR ML0w== X-Received: by 10.15.22.76 with SMTP id e52mr9556769eeu.7.1364574729699; Fri, 29 Mar 2013 09:32:09 -0700 (PDT) Received: from [192.168.1.12] (p549EA8A2.dip.t-dialin.net. [84.158.168.162]) by mx.google.com with ESMTPS id 44sm5045547eek.5.2013.03.29.09.32.06 (version=SSLv3 cipher=RC4-SHA bits=128/128); Fri, 29 Mar 2013 09:32:08 -0700 (PDT) Subject: [PATCH v2] arm/dts: OMAP3: fix pinctrl-single configuration From: Christoph Fritz To: Tony Lindgren In-Reply-To: <20130329151759.GB10155@atomide.com> References: <1364458106.3757.11.camel@mars> <20130328163854.GV10155@atomide.com> <1364549848.4634.13.camel@mars> <20130329151759.GB10155@atomide.com> Date: Fri, 29 Mar 2013 17:32:05 +0100 Message-ID: <1364574725.4634.51.camel@mars> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130329_123212_196184_5F3F087D X-CRM114-Status: GOOD ( 12.30 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chf.fritz[at]googlemail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: =?ISO-8859-1?Q?Beno=EEt?= Cousson , devicetree-discuss@lists.ozlabs.org, "Hans J. Koch" , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, Daniel Mack X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org - Fix 'function-mask' referring to TRM (Omap 36xx) Section 13.4.4: "Pad Functional Multiplexing and Configuration". - Fix 'omap3_pmx_wkup' referring to TRM Table 13-6: "Wkup Control Module Pad Configuration Register Fields". Signed-off-by: Christoph Fritz --- arch/arm/boot/dts/omap3.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 1acc261..1997b41 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -27,7 +27,7 @@ }; /* - * The soc node represents the soc top level view. It is uses for IPs + * The soc node represents the soc top level view. It is used for IPs * that are not memory mapped in the MPU view or for the MPU itself. */ soc { @@ -81,16 +81,16 @@ #address-cells = <1>; #size-cells = <0>; pinctrl-single,register-width = <16>; - pinctrl-single,function-mask = <0x7fff>; + pinctrl-single,function-mask = <0x7f1f>; }; - omap3_pmx_wkup: pinmux@0x48002a58 { + omap3_pmx_wkup: pinmux@0x48002a00 { compatible = "ti,omap3-padconf", "pinctrl-single"; - reg = <0x48002a58 0x5c>; + reg = <0x48002a00 0x5c>; #address-cells = <1>; #size-cells = <0>; pinctrl-single,register-width = <16>; - pinctrl-single,function-mask = <0x7fff>; + pinctrl-single,function-mask = <0x7f1f>; }; gpio1: gpio@48310000 {