From patchwork Thu Mar 28 08:08:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Fritz X-Patchwork-Id: 2355381 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 BD3003FD40 for ; Thu, 28 Mar 2013 08:11:08 +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 1UL7t3-0004Sr-OW; Thu, 28 Mar 2013 08:08:41 +0000 Received: from mail-bk0-x22e.google.com ([2a00:1450:4008:c01::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UL7su-0004QJ-RT for linux-arm-kernel@lists.infradead.org; Thu, 28 Mar 2013 08:08:34 +0000 Received: by mail-bk0-f46.google.com with SMTP id je9so2160240bkc.33 for ; Thu, 28 Mar 2013 01:08:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:subject:from:to:cc:content-type:date:message-id :mime-version:x-mailer:content-transfer-encoding; bh=/W6CeWv4HvaiRWFS1ubWUTQK8j1YRF+tENWiyFtqu40=; b=sMFzvhLMkVTOnMftlUaXv5PFyI0dZIXZ1bfuGxNUcYMCeNpLQqFrh4UueQe2ZPOae1 qwUPqcu87fhmbZvN2yvY4y/KBKIbgLPTdVXE6uiDAHJ3CNE31DSaAEBs8Cmc3vqqyzEX yK12zkvGM9jk2mjlPJaUAFeJWvKF6IqRnyP/XqXBnZi/TUgn7mJHz070lDZBTyUk2Mnx QvnpRvHRdDqvTBYYtYYEE9H3gTrcUm+Ts8RKak0sUF/VUcrkDSXwaaTnu3GmnR34OAxM 1F4kOpOBrrGDQflB6ktOxGUtV8CpAuP2AA4V/8vHmSgkEHhfFre7u8H9eFkLou9VPshz FVUA== X-Received: by 10.204.172.80 with SMTP id k16mr11793332bkz.123.1364458110194; Thu, 28 Mar 2013 01:08:30 -0700 (PDT) Received: from [192.168.1.12] (p549EA4EB.dip.t-dialin.net. [84.158.164.235]) by mx.google.com with ESMTPS id w6sm4033583bkz.17.2013.03.28.01.08.28 (version=SSLv3 cipher=RC4-SHA bits=128/128); Thu, 28 Mar 2013 01:08:29 -0700 (PDT) Subject: [PATCH] arm/dts: OMAP3: fix pinctrl-single configuration From: Christoph Fritz To: =?ISO-8859-1?Q?Beno=EEt?= Cousson , Tony Lindgren , linux-omap@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Date: Thu, 28 Mar 2013 09:08:26 +0100 Message-ID: <1364458106.3757.11.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-20130328_040833_056601_5F433571 X-CRM114-Status: GOOD ( 11.77 ) 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: "Hans J. Koch" , 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 Section 7.4.4: "Pad Functional Multiplexing and Configuration". - Fix 'omap3_pmx_core' referring to TRM Table 7-4: "Core Control Module Pad Configuration Register Fields" - Fix 'omap3_pmx_wkup' referring to TRM Table 7-6: "Wake-Up Control Module Pad Configuration Register Fields". Signed-off-by: Christoph Fritz --- arch/arm/boot/dts/omap3.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 1acc261..6ce3b5c 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 { @@ -77,20 +77,20 @@ omap3_pmx_core: pinmux@48002030 { compatible = "ti,omap3-padconf", "pinctrl-single"; - reg = <0x48002030 0x05cc>; + reg = <0x48002030 0x234>; #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 0x54>; #address-cells = <1>; #size-cells = <0>; pinctrl-single,register-width = <16>; - pinctrl-single,function-mask = <0x7fff>; + pinctrl-single,function-mask = <0x7f1f>; }; gpio1: gpio@48310000 {