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: 2366111 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B0DB83FD40 for ; Fri, 29 Mar 2013 16:32:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754127Ab3C2QcL (ORCPT ); Fri, 29 Mar 2013 12:32:11 -0400 Received: from mail-ea0-f180.google.com ([209.85.215.180]:58971 "EHLO mail-ea0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753263Ab3C2QcL (ORCPT ); Fri, 29 Mar 2013 12:32:11 -0400 Received: by mail-ea0-f180.google.com with SMTP id d10so278732eaj.11 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 Cc: =?ISO-8859-1?Q?Beno=EEt?= Cousson , linux-omap@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Daniel Mack , "Hans J. Koch" 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 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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 {