From patchwork Thu Dec  9 01:55:55 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "sim.chinyeow" <chinyeow.sim.xt@renesas.com>
X-Patchwork-Id: 392692
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 oB91v8ht017855
	for <patchwork-sh@patchwork.kernel.org>; Thu, 9 Dec 2010 01:57:08 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756452Ab0LIB5H (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Wed, 8 Dec 2010 20:57:07 -0500
Received: from relmlor3.renesas.com ([210.160.252.173]:61104 "EHLO
	relmlor3.renesas.com" rhost-flags-OK-OK-FAIL-FAIL) by vger.kernel.org
	with ESMTP id S1754184Ab0LIB5H (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Wed, 8 Dec 2010 20:57:07 -0500
Received: from relmlir4.idc.renesas.com ([10.200.68.154])
	by relmlor3.idc.renesas.com ( SJSMS)
	with ESMTP id <0LD500IGL1D8CV00@relmlor3.idc.renesas.com> for
	linux-sh@vger.kernel.org; Thu, 09 Dec 2010 10:55:56 +0900 (JST)
Received: from relmlac2.idc.renesas.com ([10.200.69.22])
	by relmlir4.idc.renesas.com ( SJSMS)
	with ESMTP id <0LD500AKH1D8D640@relmlir4.idc.renesas.com> for
	linux-sh@vger.kernel.org; Thu, 09 Dec 2010 10:55:56 +0900 (JST)
Received: by relmlac2.idc.renesas.com (Postfix, from userid 0)
	id F1C3A2808F; Thu, 09 Dec 2010 10:55:55 +0900 (JST)
Received: from relmlii2.idc.renesas.com [10.200.68.66]	by
	relmlac2.idc.renesas.com with ESMTP id LAD13492; Thu,
	09 Dec 2010 10:55:55 +0900
X-IronPort-AV: E=Sophos;i="4.59,318,1288537200";   d="scan'208";a="676488"
Received: from unknown (HELO PG10412) ([172.30.8.130])
	by relmlii2.idc.renesas.com with ESMTP;
	Thu, 09 Dec 2010 10:55:55 +0900
From: chinyeow.sim.xt@renesas.com
To: linux-sh@vger.kernel.org, "'Paul Mundt'" <lethal@linux-sh.org>,
	magnus.damm@gmail.com
Subject: [PATCH] ARM: mach-shmobile: mackerel: Add keypad tca6408a support
Date: Thu, 09 Dec 2010 10:55:55 +0900
Message-id: <57DD4A9F06D14DC9B39EEA2E7B7E05FF@rso.adwin.renesas.com>
MIME-version: 1.0
Content-type: text/plain; charset=shift_jis
Content-transfer-encoding: 7bit
X-Priority: 3 (Normal)
X-MSMail-priority: Normal
X-Mailer: Microsoft Outlook, Build 10.0.6863
X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2900.5994
Importance: Normal
Thread-index: AcuXRDdpjLPaTVhQRKurbf9fBCSLkQ==
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@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]);
	Thu, 09 Dec 2010 01:57:08 +0000 (UTC)


diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index a0caa9e..3e30a52 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -36,6 +36,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/smsc911x.h>
 #include <linux/sh_intc.h>
+#include <linux/tca6416_keypad.h>
 #include <linux/usb/r8a66597.h>
 
 #include <video/sh_mobile_lcdc.h>
@@ -413,11 +414,44 @@ static struct platform_device *mackerel_devices[] __initdata = {
 	&fsi_ak4643_device,
 };
 
+/* Keypad Initialization */
+#define KEYPAD_BUTTON(ev_type, ev_code, act_low) \
+{								\
+	.type		= ev_type,				\
+	.code		= ev_code,				\
+	.active_low	= act_low,				\
+}
+
+#define KEYPAD_BUTTON_LOW(event_code) KEYPAD_BUTTON(EV_KEY, event_code, 1)
+
+static struct tca6416_button mackerel_gpio_keys[] = {
+	KEYPAD_BUTTON_LOW(KEY_HOME),
+	KEYPAD_BUTTON_LOW(KEY_MENU),
+	KEYPAD_BUTTON_LOW(KEY_BACK),
+	KEYPAD_BUTTON_LOW(KEY_POWER),
+};
+
+static struct tca6416_keys_platform_data mackerel_tca6416_keys_info = {
+	.buttons	= mackerel_gpio_keys,
+	.nbuttons	= ARRAY_SIZE(mackerel_gpio_keys),
+	.rep		= 1,
+	.use_polling	= 0,
+	.pinmask	= 0x000F,
+};
+
 /* I2C */
+#define IRQ9 evt2irq(0x0320)
+
 static struct i2c_board_info i2c0_devices[] = {
 	{
 		I2C_BOARD_INFO("ak4643", 0x13),
 	},
+	/* Keypad */
+	{
+		I2C_BOARD_INFO("tca6408-keys", 0x20),
+		.platform_data = &mackerel_tca6416_keys_info,
+		.irq = IRQ9,
+	},
 };
 
 #define IRQ21 evt2irq(0x32a0)
@@ -525,6 +559,10 @@ static void __init mackerel_init(void)
 
 	intc_set_priority(IRQ_FSI, 3); /* irq priority FSI(3) > SMSC911X(2) */
 
+	/* enable Keypad */
+	gpio_request(GPIO_FN_IRQ9_42,	NULL);
+	set_irq_type(IRQ9, IRQ_TYPE_LEVEL_HIGH);
+
 	/* enable Accelerometer */
 	gpio_request(GPIO_FN_IRQ21,	NULL);
 	set_irq_type(IRQ21, IRQ_TYPE_LEVEL_HIGH);