From patchwork Fri Sep  3 22:28:11 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Mark F. Brown" <mark.brown314@gmail.com>
X-Patchwork-Id: 155161
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o83MUEXA007979
	for <patchwork-linux-input@patchwork.kernel.org>;
	Fri, 3 Sep 2010 22:30:15 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755144Ab0ICW3y (ORCPT
	<rfc822;patchwork-linux-input@patchwork.kernel.org>);
	Fri, 3 Sep 2010 18:29:54 -0400
Received: from mail-qw0-f46.google.com ([209.85.216.46]:51358 "EHLO
	mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755034Ab0ICW3w (ORCPT
	<rfc822; linux-input@vger.kernel.org>); Fri, 3 Sep 2010 18:29:52 -0400
Received: by mail-qw0-f46.google.com with SMTP id 6so2253930qwh.19
	for <multiple recipients>; Fri, 03 Sep 2010 15:29:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:cc:subject:date
	:message-id:x-mailer:in-reply-to:references;
	bh=h6bbBiz+s2I75WFz6cUSH+9yMUp1dHFI4y6BtPPOfOk=;
	b=UvPzc3BBXOWAMdewgoF1vSk7Yv9qSxkYsnNQ9ysyULIdl16OlZQcNMsm8ARzn5qCkp
	W4PGQ1RGEDTPRxNhvQZBAWJmoVp8FEfQz5v53bxfvlT1uuQvktUQFU+gr4XGqA03RWy0
	+zSvcjqWfewNFSNhygIq53EZPa7IAiE8xoqok=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
	b=GV4rXHCP+2XWuYpXVxOQx6DDthcJsUqB9bA2waTze7xo06VuZsV35HqIOxl+chKfrt
	EKqEr5EFtr4o9/QEGt58scpVqnQgELoc8ojguff+kwE5zPABOqrc8vLYIUp6FXEqLURg
	Fzc8IRnAzweCCd7r/fKb4lP7gZyPigAHUpw2g=
Received: by 10.229.1.143 with SMTP id 15mr779899qcf.287.1283552992176;
	Fri, 03 Sep 2010 15:29:52 -0700 (PDT)
Received: from localhost.localdomain
	(pool-173-48-128-43.bstnma.fios.verizon.net [173.48.128.43])
	by mx.google.com with ESMTPS id
	l13sm2505227qck.19.2010.09.03.15.29.50
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Fri, 03 Sep 2010 15:29:51 -0700 (PDT)
From: "Mark F. Brown" <mark.brown314@gmail.com>
To: Eric Miao <eric.y.miao@gmail.com>,
	Haojian Zhuang <haojian.zhuang@marvell.com>,
	"Mark F. Brown" <mark.brown314@gmail.com>,
	linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
	linux-kernel@vger.kernel.org, linux-input@vger.kernel.org
Cc: "Mark F. Brown" <mark.brown314@gmail.com>
Subject: [PATCH v2 6/6 RESEND] ARM: pxa168: aspenite: add board support for
	keypad
Date: Fri,  3 Sep 2010 18:28:11 -0400
Message-Id: <1283552891-13966-7-git-send-email-mark.brown314@gmail.com>
X-Mailer: git-send-email 1.7.0.4
In-Reply-To: <1283552891-13966-1-git-send-email-mark.brown314@gmail.com>
References: <1283552891-13966-1-git-send-email-mark.brown314@gmail.com>
Sender: linux-input-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-input.vger.kernel.org>
X-Mailing-List: linux-input@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Fri, 03 Sep 2010 22:30:15 +0000 (UTC)


diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 9e1bd6b..f04bae6 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -24,6 +24,8 @@
 #include <mach/pxa168.h>
 #include <mach/gpio.h>
 #include <video/pxa168fb.h>
+#include <linux/input.h>
+#include <plat/pxa27x_keypad.h>
 
 #include "common.h"
 
@@ -97,6 +99,13 @@ static unsigned long common_pin_config[] __initdata = {
 	GPIO81_LCD_DD21,
 	GPIO82_LCD_DD22,
 	GPIO83_LCD_DD23,
+
+	/* Keypad */
+	GPIO109_KP_MKIN1,
+	GPIO110_KP_MKIN0,
+	GPIO111_KP_MKOUT7,
+	GPIO112_KP_MKOUT6,
+	GPIO121_KP_MKIN4,
 };
 
 static struct smc91x_platdata smc91x_info = {
@@ -193,6 +202,23 @@ struct pxa168fb_mach_info aspenite_lcd_info = {
 	.invert_pixclock	= 0,
 };
 
+static unsigned int aspenite_matrix_key_map[] = {
+	KEY(0, 6, KEY_UP),	/* SW 4 */
+	KEY(0, 7, KEY_DOWN),	/* SW 5 */
+	KEY(1, 6, KEY_LEFT),	/* SW 6 */
+	KEY(1, 7, KEY_RIGHT),	/* SW 7 */
+	KEY(4, 6, KEY_ENTER),	/* SW 8 */
+	KEY(4, 7, KEY_ESC),	/* SW 9 */
+};
+
+static struct pxa27x_keypad_platform_data aspenite_keypad_info __initdata = {
+	.matrix_key_rows	= 5,
+	.matrix_key_cols	= 8,
+	.matrix_key_map		= aspenite_matrix_key_map,
+	.matrix_key_map_size	= ARRAY_SIZE(aspenite_matrix_key_map),
+	.debounce_interval	= 30,
+};
+
 static void __init common_init(void)
 {
 	mfp_config(ARRAY_AND_SIZE(common_pin_config));
@@ -203,6 +229,7 @@ static void __init common_init(void)
 	pxa168_add_ssp(1);
 	pxa168_add_nand(&aspenite_nand_info);
 	pxa168_add_fb(&aspenite_lcd_info);
+	pxa168_add_keypad(&aspenite_keypad_info);
 
 	/* off-chip devices */
 	platform_device_register(&smc91x_device);