From patchwork Wed Mar 5 03:39:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel FERNANDEZ X-Patchwork-Id: 3770241 Return-Path: X-Original-To: patchwork-linux-input@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 4BE3EBF13A for ; Wed, 5 Mar 2014 03:42:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7337C20218 for ; Wed, 5 Mar 2014 03:42:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9680220213 for ; Wed, 5 Mar 2014 03:42:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757255AbaCEDl4 (ORCPT ); Tue, 4 Mar 2014 22:41:56 -0500 Received: from eu1sys200aog114.obsmtp.com ([207.126.144.137]:51092 "EHLO eu1sys200aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757244AbaCEDly (ORCPT ); Tue, 4 Mar 2014 22:41:54 -0500 Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob114.postini.com ([207.126.147.11]) with SMTP ID DSNKUxac4evqbNGaBx0S6NgFEDtg3WtaSz84@postini.com; Wed, 05 Mar 2014 03:41:53 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 82FAC1BC; Wed, 5 Mar 2014 03:41:20 +0000 (GMT) Received: from mail7.sgp.st.com (unknown [164.129.223.81]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 402522A6E; Wed, 5 Mar 2014 03:41:20 +0000 (GMT) Received: from lmenx315.st.com ([10.129.4.230]) by mail7.sgp.st.com (MOS 4.3.3-GA) with ESMTP id BYN20881 (AUTH frq07381); Wed, 5 Mar 2014 04:40:48 +0100 From: Gabriel FERNANDEZ To: Dmitry Torokhov , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Rob Landley , Russell King , Grant Likely Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, kernel@stlinux.com, Lee Jones , Gabriel Fernandez , Giuseppe Condorelli Subject: [PATCH 4/5] ARM: STi: DT: add keyscan for stih41x-b2000 Date: Wed, 5 Mar 2014 04:39:31 +0100 Message-Id: <1393990772-9567-5-git-send-email-gabriel.fernandez@st.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393990772-9567-1-git-send-email-gabriel.fernandez@st.com> References: <1393990772-9567-1-git-send-email-gabriel.fernandez@st.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Add keyscan setup for stih415/h416 b2000. Both have same raw/column lines number, debounce time and keymap. Signed-off-by: Giuseppe Condorelli Signed-off-by: Gabriel Fernandez --- arch/arm/boot/dts/stih41x-b2000.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/stih41x-b2000.dtsi b/arch/arm/boot/dts/stih41x-b2000.dtsi index 1e6aa92..cf06beb 100644 --- a/arch/arm/boot/dts/stih41x-b2000.dtsi +++ b/arch/arm/boot/dts/stih41x-b2000.dtsi @@ -6,6 +6,7 @@ * it under the terms of the GNU General Public License version 2 as * publishhed by the Free Software Foundation. */ +#include / { memory{ @@ -46,5 +47,16 @@ status = "okay"; }; + + keyscan: keyscan@fe4b0000 { + keypad,num-rows = <4>; + keypad,num-columns = <4>; + st,debounce_us = <5000>; + linux,keymap = < /* in0 in1 in2 in3 */ + KEY_F13 KEY_F9 KEY_F5 KEY_F1 /* out0 */ + KEY_F14 KEY_F10 KEY_F6 KEY_F2 /* out1 */ + KEY_F15 KEY_F11 KEY_F7 KEY_F3 /* out2 */ + KEY_F16 KEY_F12 KEY_F8 KEY_F4 >; /* out3 */ + }; }; };