From patchwork Thu Jan 3 12:37:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Ying X-Patchwork-Id: 1927651 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 6642B3FC33 for ; Thu, 3 Jan 2013 13:21:43 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqkgQ-0006w9-Fz; Thu, 03 Jan 2013 13:18:06 +0000 Received: from ch1ehsobe004.messaging.microsoft.com ([216.32.181.184] helo=ch1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TqkgM-0006vQ-Ep for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 13:18:03 +0000 Received: from mail28-ch1-R.bigfish.com (10.43.68.226) by CH1EHSOBE005.bigfish.com (10.43.70.55) with Microsoft SMTP Server id 14.1.225.23; Thu, 3 Jan 2013 13:18:00 +0000 Received: from mail28-ch1 (localhost [127.0.0.1]) by mail28-ch1-R.bigfish.com (Postfix) with ESMTP id 02ED9220250; Thu, 3 Jan 2013 13:18:00 +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: 3 X-BigFish: VS3(zzzz1de0h1202h1e76h1d1ah1d2ahz70kz8275bhz2dh2a8h668h839he5bhf0ah107ah11b5h121eh1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14afh1504h1537h162dh1631h1758h1155h) Received: from mail28-ch1 (localhost.localdomain [127.0.0.1]) by mail28-ch1 (MessageSwitch) id 1357219049636143_2726; Thu, 3 Jan 2013 13:17:29 +0000 (UTC) Received: from CH1EHSMHS037.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.250]) by mail28-ch1.bigfish.com (Postfix) with ESMTP id 9750F1A01F7; Thu, 3 Jan 2013 13:17:29 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS037.bigfish.com (10.43.69.246) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 3 Jan 2013 13:17:29 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.318.3; Thu, 3 Jan 2013 13:17:28 +0000 Received: from shlinux1.ap.freescale.net (shlinux1.ap.freescale.net [10.192.225.216]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r03DHQ6V003926; Thu, 3 Jan 2013 06:17:27 -0700 Received: by shlinux1.ap.freescale.net (Postfix, from userid 1011) id 2DA811AE0C7; Thu, 3 Jan 2013 20:38:06 +0800 (CST) From: Liu Ying To: , , , , , , , , , Subject: [PATCH v3 2/3] ARM: dts: imx: Add imx51 KPP entry Date: Thu, 3 Jan 2013 20:37:33 +0800 Message-ID: <1357216654-12651-2-git-send-email-Ying.Liu@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1357216654-12651-1-git-send-email-Ying.Liu@freescale.com> References: <1357216654-12651-1-git-send-email-Ying.Liu@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.net X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130103_081802_674670_C0520EB0 X-CRM114-Status: GOOD ( 10.08 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.32.181.184 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: liu.y.victor@gmail.com, linux-doc@vger.kernel.org, Liu Ying , linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 1) Add KPP device node entry. 2) Add one KPP pinctrl entry. Signed-off-by: Liu Ying --- arch/arm/boot/dts/imx51.dtsi | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index 1f5d45e..6bda4dc 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -221,6 +221,14 @@ #interrupt-cells = <2>; }; + kpp: kpp@73f94000 { + compatible = "fsl,imx51-kpp", "fsl,imx21-kpp"; + reg = <0x73f94000 0x4000>; + interrupts = <60>; + clocks = <&clks 0>; + status = "disabled"; + }; + wdog1: wdog@73f98000 { compatible = "fsl,imx51-wdt", "fsl,imx21-wdt"; reg = <0x73f98000 0x4000>; @@ -410,6 +418,21 @@ >; }; }; + + kpp { + pinctrl_kpp_1: kppgrp-1 { + fsl,pins = < + 438 0xe0 /* MX51_PAD_KEY_ROW0__KEY_ROW0 */ + 439 0xe0 /* MX51_PAD_KEY_ROW1__KEY_ROW1 */ + 440 0xe0 /* MX51_PAD_KEY_ROW2__KEY_ROW2 */ + 441 0xe0 /* MX51_PAD_KEY_ROW3__KEY_ROW3 */ + 442 0xe8 /* MX51_PAD_KEY_COL0__KEY_COL0 */ + 444 0xe8 /* MX51_PAD_KEY_COL1__KEY_COL1 */ + 446 0xe8 /* MX51_PAD_KEY_COL2__KEY_COL2 */ + 448 0xe8 /* MX51_PAD_KEY_COL3__KEY_COL3 */ + >; + }; + }; }; pwm1: pwm@73fb4000 {