From patchwork Tue Apr 28 18:04:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Code Kipper X-Patchwork-Id: 6291301 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C1B5B9F373 for ; Tue, 28 Apr 2015 18:07:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E04B820221 for ; Tue, 28 Apr 2015 18:07:28 +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 06D10201FA for ; Tue, 28 Apr 2015 18:07:28 +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 1Yn9so-0002m0-6V; Tue, 28 Apr 2015 18:05:22 +0000 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yn9sd-0001WV-IY for linux-arm-kernel@lists.infradead.org; Tue, 28 Apr 2015 18:05:15 +0000 Received: by wief7 with SMTP id f7so22907043wie.0 for ; Tue, 28 Apr 2015 11:04:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=dftjIex7WXJsESYJiapoGANaLR5fhE792WPjVfPtDHY=; b=XKaUxJZaF9H8Q1RF8FjuWlE4NVeI3VeAaYsU56L2LfN6HrZfeojxsYJ0ltxyGJojRh URUB0vlSDT09PqOstPZj7BvrFWg7SJjW/im/TxGn9AqLTL4N2LZ1MI45vh3RDdiOH4fp /YVydgeJmbFQAHytkep53/dHWAZxOerAkz9HxkJfjZwxPFXaPqdiD7/gsLiS5l7i7AOq hqGIxL1gf5HJQyaG85aG3VjNBr4G8xRcaT98j2wigGwiuSIc7t5vqR92C4QQZGLdb1z+ QOSmSAm8Pod2rdmP0LbhpPOQaAJ/RGNC6yoDHASzj3TZXYWIlW7kZTxJkuYhHvXX3Wq0 kl3g== X-Received: by 10.194.60.43 with SMTP id e11mr35721203wjr.36.1430244289299; Tue, 28 Apr 2015 11:04:49 -0700 (PDT) Received: from coopshtpc.localdomain ([212.85.89.101]) by mx.google.com with ESMTPSA id gs7sm17531215wib.10.2015.04.28.11.04.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Apr 2015 11:04:48 -0700 (PDT) From: codekipper@gmail.com To: maxime.ripard@free-electrons.com Subject: [PATCH] ARM: sunxi: dts: split IR pins for A10 and A20 Date: Tue, 28 Apr 2015 20:04:47 +0200 Message-Id: <1430244287-29309-1-git-send-email-codekipper@gmail.com> X-Mailer: git-send-email 2.3.6 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150428_110511_759524_59B158BD X-CRM114-Status: UNSURE ( 9.38 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-arm-kernel@lists.infradead.org, Marcus Cooper 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: , 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=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 From: Marcus Cooper Currently none of the target boards nor the driver supports IR TX. However this pin is used in a few instances as a GPIO. Split the pin ctrl descriptions so that only the IR RX is configured to be used. Signed-off-by: Marcus Cooper --- arch/arm/boot/dts/sun4i-a10.dtsi | 18 ++++++++++++++++-- arch/arm/boot/dts/sun7i-a20.dtsi | 18 ++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 1d7fd68..50df9b7 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -798,14 +798,28 @@ }; ir0_pins_a: ir0@0 { - allwinner,pins = "PB3","PB4"; + allwinner,pins = "PB4"; + allwinner,function = "ir0"; + allwinner,drive = ; + allwinner,pull = ; + }; + + ir0_pins_b: ir0@1 { + allwinner,pins = "PB3"; allwinner,function = "ir0"; allwinner,drive = ; allwinner,pull = ; }; ir1_pins_a: ir1@0 { - allwinner,pins = "PB22","PB23"; + allwinner,pins = "PB23"; + allwinner,function = "ir1"; + allwinner,drive = ; + allwinner,pull = ; + }; + + ir1_pins_b: ir1@1 { + allwinner,pins = "PB22"; allwinner,function = "ir1"; allwinner,drive = ; allwinner,pull = ; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 4163ade..6168a9f 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -1001,14 +1001,28 @@ }; ir0_pins_a: ir0@0 { - allwinner,pins = "PB3","PB4"; + allwinner,pins = "PB4"; + allwinner,function = "ir0"; + allwinner,drive = ; + allwinner,pull = ; + }; + + ir0_pins_b: ir0@1 { + allwinner,pins = "PB3"; allwinner,function = "ir0"; allwinner,drive = ; allwinner,pull = ; }; ir1_pins_a: ir1@0 { - allwinner,pins = "PB22","PB23"; + allwinner,pins = "PB23"; + allwinner,function = "ir1"; + allwinner,drive = ; + allwinner,pull = ; + }; + + ir1_pins_b: ir1@1 { + allwinner,pins = "PB22"; allwinner,function = "ir1"; allwinner,drive = ; allwinner,pull = ;