From patchwork Sat Dec 6 23:15:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vishnupatekar X-Patchwork-Id: 5450911 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C949ABEEA8 for ; Sat, 6 Dec 2014 23:19:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B4D3120131 for ; Sat, 6 Dec 2014 23:19:58 +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 CF5BE2012E for ; Sat, 6 Dec 2014 23:19:57 +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 1XxOau-0001Wt-AM; Sat, 06 Dec 2014 23:16:56 +0000 Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XxOan-0001N9-T9 for linux-arm-kernel@lists.infradead.org; Sat, 06 Dec 2014 23:16:50 +0000 Received: by mail-pa0-f50.google.com with SMTP id bj1so2882701pad.23 for ; Sat, 06 Dec 2014 15:16:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=S0c9YL6KfBA3BFdE180+4cn6Vc+/wyVTse68XAi7DI8=; b=stPR6KescaWVpp9YH+NZ0By8lcG5/yQWen/9XR4F9PgUHq//ctlIBbkUP1tAhCZcgK wsoWkMEzMcNh29IMV+F4jo0Abqdzww5pGGWmtU2zNe95YbQSNhRJg64zi3yAI5lEDrbU j54P4OssUPf2XwsUm7BH6hebnhHEEHfDt057UxYssvnndumQwZ3tSlLeqk0Uai8RkAiK IMwUDESrMpBn496sTZdtNmZVj37YINMsSbTCFUtM427dbXcL3uT7xJdS9nRtaIXkL6kp eGQ8Xo8v/SJ9I9vs3lYi1IUmNwDEiITyF2F3C+R64yV1M5vDbkYOlxE+XpX5jfUo/trc n9Zg== X-Received: by 10.66.147.102 with SMTP id tj6mr40655638pab.95.1417907786735; Sat, 06 Dec 2014 15:16:26 -0800 (PST) Received: from localhost.localdomain ([124.125.90.64]) by mx.google.com with ESMTPSA id e2sm23040909pdo.11.2014.12.06.15.16.21 for (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 06 Dec 2014 15:16:25 -0800 (PST) From: vishnupatekar X-Google-Original-From: vishnupatekar To: linux-sunxi@googlegroups.com, dmitry.torokhov@gmail.com, maxime.ripard@free-electrons.com, linux@arm.linux.org.uk Subject: [PATCHv2 3/3] ARM:dts:sunxi:ps2 dt nodes for A10/A20 PS2 controller. Date: Sun, 7 Dec 2014 04:45:19 +0530 Message-Id: <1417907719-26775-4-git-send-email-VishnuPatekar0510@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1417907719-26775-1-git-send-email-VishnuPatekar0510@gmail.com> References: <1417907719-26775-1-git-send-email-VishnuPatekar0510@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141206_151649_999009_99780FD5 X-CRM114-Status: UNSURE ( 8.69 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.6 (/) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, vishnupatekar , pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, leafy.myeh@newbietech.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, galak@codeaurora.org, 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: , 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.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, 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 Added ps2 nodes in lime2 board dts. By default ps20 and ps21 nodes are commented as ps20 pins conflict with HDMI connector on Lime2 Board. Signed-off-by: vishnupatekar --- arch/arm/boot/dts/sun4i-a10.dtsi | 27 +++++++++++++++++++++ arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 13 ++++++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 29 +++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 5e2ec2d..4726e8d 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -615,6 +615,19 @@ allwinner,drive = <0>; allwinner,pull = <0>; }; + ps2_0_pins: ps2_0@0 { + allwinner,pins = "PI20","PI21"; + allwinner,function = "ps2"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + ps2_1_pins: ps2_1@0 { + allwinner,pins = "PH12","PH13"; + allwinner,function = "ps2"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + }; timer@01c20c00 { @@ -781,5 +794,19 @@ #address-cells = <1>; #size-cells = <0>; }; + ps20: ps2@0x01c2a000 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a000 0x400>; + interrupts = <0 62 4>; + clocks = <&apb1_gates 6>; + status = "disabled"; + }; + ps21: ps2@0x01c2a400 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a400 0x400>; + interrupts = <0 63 4>; + clocks = <&apb1_gates 7>; + status = "disabled"; + }; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts index ed364d5..5624e63 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts @@ -112,6 +112,19 @@ pinctrl-0 = <&uart0_pins_a>; status = "okay"; }; + /* PS2 0 and PS2 1 are disabled by default + To enable PS2 0 and PS2 1 uncomment below ps20 and ps21 nodes + Please note that ps20 pins conflict with HDMI on Lime2 Board*/ + /*ps20: ps2@0x01c2a000 { + pinctrl-names = "default"; + pinctrl-0 = <&ps2_0_pins>; + status = "okay"; + }; + ps21: ps2@0x01c2a400 { + pinctrl-names = "default"; + pinctrl-0 = <&ps2_1_pins>; + status = "okay"; + };*/ i2c0: i2c@01c2ac00 { pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 8605f2b..96fe37d 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -852,6 +852,19 @@ allwinner,drive = <0>; allwinner,pull = <0>; }; + ps2_0_pins: ps2_0@0 { + allwinner,pins = "PI20","PI21"; + allwinner,function = "ps2"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + ps2_1_pins: ps2_1@0 { + allwinner,pins = "PH12","PH13"; + allwinner,function = "ps2"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + }; timer@01c20c00 { @@ -1079,5 +1092,21 @@ #interrupt-cells = <3>; interrupts = <1 9 0xf04>; }; + ps20: ps2@0x01c2a000 { + compatible = "allwinner,sun7i-a20-ps2"; + reg = <0x01c2a000 0x400>; + interrupts = <0 62 4>; + clocks = <&apb1_gates 6>; + status = "disabled"; + }; + ps21: ps2@0x01c2a400 { + compatible = "allwinner,sun7i-a20-ps2"; + reg = <0x01c2a400 0x400>; + interrupts = <0 63 4>; + clocks = <&apb1_gates 7>; + status = "disabled"; + }; + + }; };