From patchwork Wed Aug 24 13:09:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Cousson X-Patchwork-Id: 1092402 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7ODFMo2001070 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 24 Aug 2011 13:15:43 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QwDGw-0005H6-V1; Wed, 24 Aug 2011 13:13:36 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QwDGw-00055q-Bc; Wed, 24 Aug 2011 13:13:34 +0000 Received: from arroyo.ext.ti.com ([192.94.94.40]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QwDEk-0004Wf-C4 for linux-arm-kernel@lists.infradead.org; Wed, 24 Aug 2011 13:11:20 +0000 Received: from dlep33.itg.ti.com ([157.170.170.112]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id p7ODBHPY020380 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 24 Aug 2011 08:11:17 -0500 Received: from dlep26.itg.ti.com (smtp-le.itg.ti.com [157.170.170.27]) by dlep33.itg.ti.com (8.13.7/8.13.8) with ESMTP id p7ODBGHP011905; Wed, 24 Aug 2011 08:11:16 -0500 (CDT) Received: from DLEE74.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id p7ODBGED027832; Wed, 24 Aug 2011 08:11:16 -0500 (CDT) Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Wed, 24 Aug 2011 08:11:16 -0500 Received: from localhost.localdomain (lncpu04.tif.ti.com [137.167.102.15]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id p7ODA8Hj023561; Wed, 24 Aug 2011 08:11:14 -0500 From: Benoit Cousson To: , Subject: [RFC PATCH 09/10] arm/dts: OMAP4: Add gpio nodes Date: Wed, 24 Aug 2011 15:09:15 +0200 Message-ID: <1314191356-10963-10-git-send-email-b-cousson@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1314191356-10963-1-git-send-email-b-cousson@ti.com> References: <1314191356-10963-1-git-send-email-b-cousson@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110824_091118_653022_E3369829 X-CRM114-Status: GOOD ( 13.05 ) X-Spam-Score: -2.8 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [192.94.94.40 listed in list.dnswl.org] -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: khilman@ti.com, Benoit Cousson , manjugk@ti.com, devicetree-discuss@lists.ozlabs.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Charulatha V X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 24 Aug 2011 13:15:43 +0000 (UTC) Add the 6 GPIOs controller nodes. Since the GPIO driver is still under cleanup, a couple of temp hacks are needed. They will be removed as soon as the driver will be cleaned. Remove gpio static device initialisation if CONFIG_OF is defined. Signed-off-by: Benoit Cousson Cc: Grant Likely Cc: Charulatha V --- arch/arm/boot/dts/omap4.dtsi | 69 ++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/gpio.c | 2 + 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 231d7b4..f672927 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -110,5 +110,74 @@ compatible = "ti,omap-spinlock"; hwmods = "spinlock"; }; + + gpio1: gpio@1 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio1"; + /* id should not be needed with a global GPIO parent */ + id = <1>; + bank_width = <32>; + debounce; + /* XXX: big hack until the bank_count is removed */ + bank_count = <6>; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio2: gpio@2 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio2"; + id = <2>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio3: gpio@3 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio3"; + id = <3>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio4: gpio@4 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio4"; + id = <4>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio5: gpio@5 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio5"; + id = <5>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio6: gpio@6 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio6"; + id = <6>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; }; }; diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 8cbfbc2..c51e952 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c @@ -16,6 +16,7 @@ * GNU General Public License for more details. */ +#ifndef CONFIG_OF #include #include #include @@ -126,3 +127,4 @@ static int __init omap2_gpio_init(void) NULL); } postcore_initcall(omap2_gpio_init); +#endif