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: 2355311 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 13F36DF2A1 for ; Thu, 28 Mar 2013 08:08:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755560Ab3C1IId (ORCPT ); Thu, 28 Mar 2013 04:08:33 -0400 Received: from mail-bk0-f43.google.com ([209.85.214.43]:57809 "EHLO mail-bk0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755353Ab3C1IIc (ORCPT ); Thu, 28 Mar 2013 04:08:32 -0400 Received: by mail-bk0-f43.google.com with SMTP id jm2so674974bkc.2 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 Cc: Daniel Mack , "Hans J. Koch" 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 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 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 {