From patchwork Fri Jun 21 18:09:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Sittig X-Patchwork-Id: 2763831 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 9D6169F756 for ; Fri, 21 Jun 2013 18:14:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C2CB020140 for ; Fri, 21 Jun 2013 18:14:44 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B74A62012C for ; Fri, 21 Jun 2013 18:14:43 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq5ob-0006wb-56; Fri, 21 Jun 2013 18:12:06 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq5o8-00028n-6I; Fri, 21 Jun 2013 18:11:36 +0000 Received: from mail-out.m-online.net ([212.18.0.10]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq5nT-00022f-N8 for linux-arm-kernel@lists.infradead.org; Fri, 21 Jun 2013 18:10:56 +0000 Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3bcScV1Phvz3hj88; Fri, 21 Jun 2013 20:10:34 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3bcScV0gcczbbjy; Fri, 21 Jun 2013 20:10:34 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id lO_Kv1Uq-PiN; Fri, 21 Jun 2013 20:10:32 +0200 (CEST) X-Auth-Info: B/twhZus3Wcuh4BBncPtob++J3YpVALjuta7j0CaYGg= Received: from localhost (kons-4d027c0a.pool.mediaWays.net [77.2.124.10]) by mail.mnet-online.de (Postfix) with ESMTPA; Fri, 21 Jun 2013 20:10:32 +0200 (CEST) From: Gerhard Sittig To: Dmitry Torokhov , linux-input@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Chao Xie Subject: [PATCH v1 11/12] input: keypad-matrix: AC14xx device tree update Date: Fri, 21 Jun 2013 20:09:57 +0200 Message-Id: <1371838198-7327-12-git-send-email-gsi@denx.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1371838198-7327-1-git-send-email-gsi@denx.de> References: <1371838198-7327-1-git-send-email-gsi@denx.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130621_141055_896186_E9D9388B X-CRM114-Status: GOOD ( 10.94 ) X-Spam-Score: -1.9 (-) Cc: Eric Miao , Detlev Zundel , Arnd Bergmann , Tony Lindgren , Gerhard Sittig , Sekhar Nori , Haojian Zhuang , Marek Vasut , Ralf Baechle , Anatolij Gustschin 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=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 - catchup in the 'ifm AC14xx' board's device tree with recently added keypad-matrix driver features: individual pin polarity for rows and columns, push/pull pin operation for columns - slight re-ordering of keypad-matrix related settings, and tuning of timing specs for more reliable detection of short lived key presses (including a range spec to reduce timer management overhead) as well as a slightly increased overall matrix poll frequency - fix keymap comments, make the names match the codes Signed-off-by: Gerhard Sittig --- arch/powerpc/boot/dts/ac14xx.dts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts index a27a460..502cc37 100644 --- a/arch/powerpc/boot/dts/ac14xx.dts +++ b/arch/powerpc/boot/dts/ac14xx.dts @@ -350,13 +350,14 @@ matrix_keypad@0 { compatible = "gpio-matrix-keypad"; debounce-delay-ms = <5>; - col-scan-delay-us = <1>; - gpio-activelow; - col-gpios-binary; - col-switch-delay-ms = <200>; + col-scan-delay-us = <5 100>; + col-switch-delay-ms = <15>; + col-gpios-binary; + col-gpios-pushpull; col-gpios = <&gpio_pic 1 0>; /* pin1 */ + row-gpios-activelow; row-gpios = <&gpio_pic 2 0 /* pin2 */ &gpio_pic 3 0 /* pin3 */ &gpio_pic 4 0>; /* pin4 */ @@ -365,8 +366,8 @@ 0x01000067 /* UP */ 0x02000066 /* FN RIGHT */ 0x00010069 /* LEFT */ - 0x0101006a /* DOWN */ - 0x0201006c>; /* RIGHT */ + 0x0101006a /* RIGHT */ + 0x0201006c>; /* DOWN */ }; };