From patchwork Fri Dec 12 18:25:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vishnupatekar X-Patchwork-Id: 5484831 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 0190BBEEA8 for ; Fri, 12 Dec 2014 18:34:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A0DD201DD for ; Fri, 12 Dec 2014 18:34:19 +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 00BBA201C8 for ; Fri, 12 Dec 2014 18:34:18 +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 1XzV0u-000496-Tp; Fri, 12 Dec 2014 18:32:28 +0000 Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XzV0p-00040V-En for linux-arm-kernel@lists.infradead.org; Fri, 12 Dec 2014 18:32:24 +0000 Received: by mail-pa0-f45.google.com with SMTP id lf10so7111184pab.4 for ; Fri, 12 Dec 2014 10:32:02 -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=/iEbM1CCET2fffVIs9BeahhasaCA5xr/cb4aLUMzpF4=; b=NPSF/5yUu/UF0xaEM45dC2bryol7o13Qv4XuBuy9HQFqgwznieo/yz2KkjZjj1KqMr 8zN4ftqSHRFw/96N69wViEICS1sbLeIm+eUyJUaUPkk1iJcPNPr0nQIvgP05RMgN2fdV FXbj4dnTpsnl24vXyDvCG18MAjjlZxutc0BSMNTk6aaEVTwRYElNm4RCi6ycIYi3Y3gA 51WPpc+PNMQCG6xvu09RU9G0B+SMpCFX+UzOibTOOC0nPjFji/ui3cF8jvByHDIC3qNT V0J8EZJbERMq/yJoKrYJg7Q5ilaDCtoc0PvgXseoC6TpPKHrGpyYT9xxHT5zZxILGFh5 79zQ== X-Received: by 10.70.134.36 with SMTP id ph4mr28989704pdb.29.1418409122202; Fri, 12 Dec 2014 10:32:02 -0800 (PST) Received: from localhost.localdomain ([124.125.90.64]) by mx.google.com with ESMTPSA id w2sm2131545pbs.59.2014.12.12.10.31.54 for (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Dec 2014 10:32:01 -0800 (PST) From: VishnuPatekar To: linux-input@vger.kernel.org, maxime.ripard@free-electrons.com, dmitry.torokhov@gmail.com, hdegoede@redhat.com Subject: [PATCHv3 3/5] ARM: sunxi: dts: Add PS2 nodes to dtsi for A10 and A20 Date: Fri, 12 Dec 2014 23:55:46 +0530 Message-Id: <1418408748-9797-4-git-send-email-vishnupatekar0510@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1418408748-9797-1-git-send-email-vishnupatekar0510@gmail.com> References: <1418408748-9797-1-git-send-email-vishnupatekar0510@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141212_103223_550795_472EF6EB X-CRM114-Status: UNSURE ( 9.13 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.6 (/) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, VishnuPatekar , linux@arm.linux.org.uk, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, benh@kernel.crashing.org, msalter@redhat.com, linux-kernel@vger.kernel.org, ralf@linux-mips.org, robh+dt@kernel.org, jdelvare@suse.de, galak@codeaurora.org, grant.likely@linaro.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=-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 1) Fixup the sun4i ps/2 nodes interrupt property, sun4i interrupts take only 1 specifier 2) dt bindings should use the compat string for the earliest version of the hardware which has the relevant hardware block, unless there are differences, the A10 and A20 ps2 controllers are identical, so for both sun4i-a10-ps2 should be used as compat string, update the sun7i.dtsi ps2 entries to use the sun4i-a10-ps2 compat string. Signed-off-by: VishnuPatekar Signed-off-by: Hans de Goede --- arch/arm/boot/dts/sun4i-a10.dtsi | 17 +++++++++++++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 7b4099f..ef9a01c 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -629,6 +629,7 @@ allwinner,drive = <0>; allwinner,pull = <0>; }; + }; timer@01c20c00 { @@ -795,5 +796,21 @@ #address-cells = <1>; #size-cells = <0>; }; + + ps20: ps2@01c2a000 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a000 0x400>; + interrupts = <62>; + clocks = <&apb1_gates 6>; + status = "disabled"; + }; + + ps21: ps2@01c2a400 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a400 0x400>; + interrupts = <63>; + clocks = <&apb1_gates 7>; + status = "disabled"; + }; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index e21ce59..6ab7714 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -866,6 +866,7 @@ allwinner,drive = <0>; allwinner,pull = <0>; }; + }; timer@01c20c00 { @@ -1093,5 +1094,22 @@ #interrupt-cells = <3>; interrupts = <1 9 0xf04>; }; + + ps20: ps2@01c2a000 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a000 0x400>; + interrupts = <0 62 4>; + clocks = <&apb1_gates 6>; + status = "disabled"; + }; + + ps21: ps2@01c2a400 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a400 0x400>; + interrupts = <0 63 4>; + clocks = <&apb1_gates 7>; + status = "disabled"; + }; + }; };