From patchwork Fri Oct 24 16:55:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 5148911 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 AE46B9F30B for ; Fri, 24 Oct 2014 17:00:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7515620220 for ; Fri, 24 Oct 2014 17:00:18 +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 ADFE32024F for ; Fri, 24 Oct 2014 17:00:17 +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 1XhiAI-0001EC-3f; Fri, 24 Oct 2014 16:56:38 +0000 Received: from pandora.arm.linux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xhi9u-000102-Q2 for linux-arm-kernel@lists.infradead.org; Fri, 24 Oct 2014 16:56:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From; bh=+Y2t7lxTM6MZHmIsivYtg3IMGlfESeCUuFJJli45fpM=; b=EDWSP+mAfGllMkTYOV/aQQVay6Hk4CJvmcdoPmWZuUzsd8KEvDDJaeciZTePS0hQZr3qTrrECiMU/2pZWNO2VPZ6SxlIbbatCehBMz+qDk3fN27RjiglL2XGzE8v+/HhuvYd411WQMg6K/LtSUurB7xIim7G1SU47C59TD0XPnk=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2001:4d48:ad52:3201:222:68ff:fe15:37dd]:33728 helo=rmk-PC.arm.linux.org.uk) by pandora.arm.linux.org.uk with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1Xhi9P-0001BM-9o; Fri, 24 Oct 2014 17:55:43 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1Xhi9I-0005pP-Ky; Fri, 24 Oct 2014 17:55:36 +0100 From: Russell King To: Shawn Guo Subject: [PATCH 3/4] ARM: dts: hummingboard: gpio-ir on gpio 3,5 MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Fri, 24 Oct 2014 17:55:36 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141024_095615_151676_784110E8 X-CRM114-Status: GOOD ( 12.35 ) X-Spam-Score: -1.5 (-) Cc: Mark Rutland , devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , Rob Herring , Sascha Hauer , Kumar Gala , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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 X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 From: Rabeeh Khoury To: Shawn Guo HummingBoard after rev 2.0 and the production one starting rev 3.0 uses gpio 3,5 (EIM_DA5 pad) as the gpio infra red receiver input. Since the original Carrier1 board is obsolete and we are retiring it, update the DT file for this. This will mean IR reception will not work on Carrier1 with this DT file. Signed-off-by: Rabeeh Khoury Signed-off-by: Russell King --- arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi index bf38072a2779..1f355804c2cb 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi @@ -11,9 +11,9 @@ ir_recv: ir-receiver { compatible = "gpio-ir-receiver"; - gpios = <&gpio1 2 1>; + gpios = <&gpio3 5 1>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_hummingboard_gpio1_2>; + pinctrl-0 = <&pinctrl_hummingboard_gpio3_5>; }; regulators { @@ -103,9 +103,9 @@ >; }; - pinctrl_hummingboard_gpio1_2: hummingboard-gpio1_2 { + pinctrl_hummingboard_gpio3_5: hummingboard-gpio3_5 { fsl,pins = < - MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 + MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x80000000 >; };