From patchwork Thu Jun 5 19:27:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Ruder X-Patchwork-Id: 4308491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F333D9F326 for ; Thu, 5 Jun 2014 19:30:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 358A020320 for ; Thu, 5 Jun 2014 19:30:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4FB9E202F2 for ; Thu, 5 Jun 2014 19:30:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WsdLL-0001yU-Nu; Thu, 05 Jun 2014 19:28:55 +0000 Received: from new1-smtp.messagingengine.com ([66.111.4.221]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WsdL3-0001gc-MM for linux-arm-kernel@lists.infradead.org; Thu, 05 Jun 2014 19:28:38 +0000 Received: from compute2.internal (compute2.nyi.mail.srv.osa [10.202.2.42]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 3284B50E for ; Thu, 5 Jun 2014 15:28:06 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute2.internal (MEProxy); Thu, 05 Jun 2014 15:28:06 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references; s=smtpout; bh=F/vZxX4slQVzOtMXvpBQ/EMZS BQ=; b=kMKlUuyKHRH6gYOFQIm+IkM6k+e09RUaD3dFO5PFdZNj9xgP0wY1755z+ 4GAj3orgx94jWPn8I169KWKHzOUS8dUhoPsfsiz96zG6JimRvjXEdolPNqZVYZgl XNE3thJUPg9repOZ9bIpDRZu3+sJ7AQ+CqNU+bSHYtQSYnyj8s= X-Sasl-enc: QTo5YzJKT2Eqxe+2aLphpcqj7t4OK7EwpDx5rLgaNcfy 1401996484 Received: from andrewruder-hplin.dci.local (unknown [64.198.156.98]) by mail.messagingengine.com (Postfix) with ESMTPA id 8E58EC007B2; Thu, 5 Jun 2014 15:28:03 -0400 (EDT) From: Andrew Ruder To: devicetree@vger.kernel.org Subject: [PATCH 6/6] arm: pxa{27x,3xx}.dtsi: gpio cleanups Date: Thu, 5 Jun 2014 14:27:08 -0500 Message-Id: <425d904329d1ef92de5c475896682500ff66889c.1401995177.git.andrew.ruder@elecsyscorp.com> X-Mailer: git-send-email 1.9.0.rc3.12.gbc97e2d In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140605_122837_847722_32A321D1 X-CRM114-Status: UNSURE ( 8.45 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, linux@arm.linux.org.uk, pawel.moll@arm.com, linux-doc@vger.kernel.org, rdunlap@infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, galak@codeaurora.org, Andrew Ruder , linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP * Define gpio0, gpio1 interrupts in pxa2xx since they are also used by the pxa27x, pxa25x and pxa3xx. * Remove several redundant tags from pxa3xx's gpio since they are the same as the included pxa2xx.dtsi * Correctly override the compatible tag in the pxa27x for the gpio module. Signed-off-by: Andrew Ruder --- arch/arm/boot/dts/pxa27x.dtsi | 3 +++ arch/arm/boot/dts/pxa2xx.dtsi | 4 ++-- arch/arm/boot/dts/pxa3xx.dtsi | 7 ------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi index 2d05aa9..26841d8 100644 --- a/arch/arm/boot/dts/pxa27x.dtsi +++ b/arch/arm/boot/dts/pxa27x.dtsi @@ -43,5 +43,8 @@ #size-cells = <0>; status = "disabled"; }; + gpio: gpio@40e00000 { + compatible = "intel,pxa27x-gpio"; + }; }; }; diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index d233088..c21e80f 100644 --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/arch/arm/boot/dts/pxa2xx.dtsi @@ -53,8 +53,8 @@ reg = <0x40e00000 0x10000>; gpio-controller; #gpio-cells = <0x2>; - interrupts = <10>; - interrupt-names = "gpio_mux"; + interrupts = <8 9 10>; + interrupt-names = "gpio0", "gpio1", "gpio_mux"; interrupt-controller; #interrupt-cells = <0x2>; ranges; diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index 83bb0ef..e689b99 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -31,13 +31,6 @@ gpio: gpio@40e00000 { compatible = "intel,pxa3xx-gpio"; - reg = <0x40e00000 0x10000>; - interrupt-names = "gpio0", "gpio1", "gpio_mux"; - interrupts = <8 9 10>; - gpio-controller; - #gpio-cells = <0x2>; - interrupt-controller; - #interrupt-cells = <0x2>; }; }; };