From patchwork Tue Jan 14 09:23:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 3484851 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 234889F169 for ; Tue, 14 Jan 2014 09:24:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34043201CD for ; Tue, 14 Jan 2014 09:24:13 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 8E62A20179 for ; Tue, 14 Jan 2014 09:24:11 +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 1W30E6-00013Z-EM; Tue, 14 Jan 2014 09:24:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W30E4-0005sG-51; Tue, 14 Jan 2014 09:24:00 +0000 Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11] helo=va3outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W30E1-0005r8-9W for linux-arm-kernel@lists.infradead.org; Tue, 14 Jan 2014 09:23:58 +0000 Received: from mail188-va3-R.bigfish.com (10.7.14.252) by VA3EHSOBE002.bigfish.com (10.7.40.22) with Microsoft SMTP Server id 14.1.225.22; Tue, 14 Jan 2014 09:23:36 +0000 Received: from mail188-va3 (localhost [127.0.0.1]) by mail188-va3-R.bigfish.com (Postfix) with ESMTP id E92214E01E8; Tue, 14 Jan 2014 09:23:35 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 10 X-BigFish: VS10(zcb8kzb922lzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah1fc6h1082kzz1de098h8275bh1de097hz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h2327h2336h2438h2461h1155h) Received: from mail188-va3 (localhost.localdomain [127.0.0.1]) by mail188-va3 (MessageSwitch) id 1389691413734310_29751; Tue, 14 Jan 2014 09:23:33 +0000 (UTC) Received: from VA3EHSMHS016.bigfish.com (unknown [10.7.14.231]) by mail188-va3.bigfish.com (Postfix) with ESMTP id A4A8C120047; Tue, 14 Jan 2014 09:23:33 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS016.bigfish.com (10.7.99.26) with Microsoft SMTP Server (TLS) id 14.16.227.3; Tue, 14 Jan 2014 09:23:33 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.3.158.2; Tue, 14 Jan 2014 09:23:32 +0000 Received: from ubuntu.ap.freescale.net (ubuntu-010192242118.ap.freescale.net [10.192.242.118]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s0E9NUsA015497; Tue, 14 Jan 2014 02:23:30 -0700 From: Anson Huang To: Subject: [PATCH V2] ARM: dts: imx6sl: add keypad support for i.mx6sl-evk board. Date: Tue, 14 Jan 2014 17:23:31 +0800 Message-ID: <1389691411-25231-1-git-send-email-b20788@freescale.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140114_042357_412851_D33601F6 X-CRM114-Status: GOOD ( 10.11 ) X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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: , 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.3 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 i.MX6SL EVK board has a 3*3 keypad matrix to support 8 keypads, enable them, the keymap is as below: SW6: MATRIX_KEY(0x0, 0x0, 0x67) /* ROW0, COL0, KEY_UP */ SW7: MATRIX_KEY(0x0, 0x1, 0x6c) /* ROW0, COL1, KEY_DOWN */ SW8: MATRIX_KEY(0x0, 0x2, 0x1c) /* ROW0, COL2, KEY_ENTER */ SW9: MATRIX_KEY(0x1, 0x0, 0x66) /* ROW1, COL0, KEY_HOME */ SW10: MATRIX_KEY(0x1, 0x1, 0x6a) /* ROW1, COL1, KEY_RIGHT */ SW11: MATRIX_KEY(0x1, 0x2, 0x69) /* ROW1, COL2, KEY_LEFT */ SW12: MATRIX_KEY(0x2, 0x0, 0x72) /* ROW2, COL0, KEY_VOLUMEDOWN */ SW13: MATRIX_KEY(0x2, 0x1, 0x73) /* ROW2, COL1, KEY_VOLUMEUP */ Signed-off-by: Anson Huang --- arch/arm/boot/dts/imx6sl-evk.dts | 28 ++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6sl.dtsi | 2 ++ 2 files changed, 30 insertions(+) diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts index f5e4513..a2a0399 100644 --- a/arch/arm/boot/dts/imx6sl-evk.dts +++ b/arch/arm/boot/dts/imx6sl-evk.dts @@ -8,6 +8,7 @@ /dts-v1/; +#include #include "imx6sl.dtsi" / { @@ -93,6 +94,17 @@ fsl,pins = ; }; + pinctrl_kpp: kppgrp { + fsl,pins = < + MX6SL_PAD_KEY_ROW0__KEY_ROW0 0x1b010 + MX6SL_PAD_KEY_ROW1__KEY_ROW1 0x1b010 + MX6SL_PAD_KEY_ROW2__KEY_ROW2 0x1b0b0 + MX6SL_PAD_KEY_COL0__KEY_COL0 0x110b0 + MX6SL_PAD_KEY_COL1__KEY_COL1 0x110b0 + MX6SL_PAD_KEY_COL2__KEY_COL2 0x110b0 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = ; }; @@ -139,6 +151,22 @@ }; }; +&kpp { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_kpp>; + linux,keymap = < + MATRIX_KEY(0x0, 0x0, 0x67) /* ROW0, COL0, KEY_UP */ + MATRIX_KEY(0x0, 0x1, 0x6c) /* ROW0, COL1, KEY_DOWN */ + MATRIX_KEY(0x0, 0x2, 0x1c) /* ROW0, COL2, KEY_ENTER */ + MATRIX_KEY(0x1, 0x0, 0x66) /* ROW1, COL0, KEY_HOME */ + MATRIX_KEY(0x1, 0x1, 0x6a) /* ROW1, COL1, KEY_RIGHT */ + MATRIX_KEY(0x1, 0x2, 0x69) /* ROW1, COL2, KEY_LEFT */ + MATRIX_KEY(0x2, 0x0, 0x72) /* ROW2, COL0, KEY_VOLUMEDOWN */ + MATRIX_KEY(0x2, 0x1, 0x73) /* ROW2, COL1, KEY_VOLUMEUP */ + >; + status = "okay"; +}; + &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index a5ef3c3..a449c4f 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -393,8 +393,10 @@ }; kpp: kpp@020b8000 { + compatible = "fsl,imx6sl-kpp", "fsl,imx21-kpp"; reg = <0x020b8000 0x4000>; interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clks IMX6SL_CLK_DUMMY>; }; wdog1: wdog@020bc000 {