From patchwork Mon Sep 14 11:23:00 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Kuninori Morimoto <morimoto.kuninori@renesas.com>
X-Patchwork-Id: 47290
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8EBMwqR008020
	for <patchwork-sh@patchwork.kernel.org>; Mon, 14 Sep 2009 11:23:04 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755302AbZINLXA (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Mon, 14 Sep 2009 07:23:00 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755305AbZINLXA
	(ORCPT <rfc822; linux-sh-outgoing>);
	Mon, 14 Sep 2009 07:23:00 -0400
Received: from mail.renesas.com ([202.234.163.13]:45295 "EHLO
	mail01.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1755302AbZINLW7 (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Mon, 14 Sep 2009 07:22:59 -0400
X-AuditID: ac140384-0000000b000004f6-21-4aae27952244
Received: from guardian01.idc.renesas.com ([172.20.8.200])
	by mail01.idc.renesas.com (sendmail) with ESMTP id n8EBN0Fh024700;
	Mon, 14 Sep 2009 20:23:00 +0900 (JST)
Received: (from root@localhost)
	by guardian01.idc.renesas.com with  id n8EBN20L024504;
	Mon, 14 Sep 2009 20:23:02 +0900 (JST)
Received: from mta02.idc.renesas.com (localhost [127.0.0.1])
	by mta02.idc.renesas.com with ESMTP id n8EBN1md016526;
	Mon, 14 Sep 2009 20:23:01 +0900 (JST)
Received: from PG10870.renesas.com ([172.30.8.159])
	by ims05.idc.renesas.com (Sendmail)
	with ESMTPA id <0KPY00I2TKYDLN@ims05.idc.renesas.com>; Mon,
	14 Sep 2009 20:23:01 +0900 (JST)
Date: Mon, 14 Sep 2009 20:23:00 +0900
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Subject: [PATCH 2/2] sh: Add KEYSC support for EcoVec24
To: SH-Linux <linux-sh@vger.kernel.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Message-id: <uzl8xepnv.wl%morimoto.kuninori@renesas.com>
MIME-version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-type: text/plain; charset=US-ASCII
User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=)
	APEL/10.7 Emacs/22.1 (i386-mingw-nt5.1.2600) MULE/5.0 (SAKAKI)
	Meadow/3.00-dev (KIKU)
X-Brightmail-Tracker: AAAAAA==
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
---
 arch/sh/boards/mach-ecovec24/setup.c |   52 ++++++++++++++++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 2129e4c..40decfe 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -18,10 +18,12 @@
 #include <linux/delay.h>
 #include <linux/usb/r8a66597.h>
 #include <linux/i2c.h>
+#include <linux/input.h>
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
 #include <asm/heartbeat.h>
 #include <asm/sh_eth.h>
+#include <asm/sh_keysc.h>
 #include <cpu/sh7724.h>
 
 /*
@@ -332,6 +334,46 @@ static struct i2c_board_info i2c1_devices[] = {
 	},
 };
 
+/* KEYSC */
+static struct sh_keysc_info keysc_info = {
+	.mode		= SH_KEYSC_MODE_1,
+	.scan_timing	= 3,
+	.delay		= 50,
+	.kycr2_delay	= 100,
+	.keycodes	= { KEY_1, 0, 0, 0, 0,
+			    KEY_2, 0, 0, 0, 0,
+			    KEY_3, 0, 0, 0, 0,
+			    KEY_4, 0, 0, 0, 0,
+			    KEY_5, 0, 0, 0, 0,
+			    KEY_6, 0, 0, 0, 0, },
+};
+
+static struct resource keysc_resources[] = {
+	[0] = {
+		.name	= "KEYSC",
+		.start  = 0x044b0000,
+		.end    = 0x044b000f,
+		.flags  = IORESOURCE_MEM,
+	},
+	[1] = {
+		.start  = 79,
+		.flags  = IORESOURCE_IRQ,
+	},
+};
+
+static struct platform_device keysc_device = {
+	.name           = "sh_keysc",
+	.id             = 0, /* keysc0 clock */
+	.num_resources  = ARRAY_SIZE(keysc_resources),
+	.resource       = keysc_resources,
+	.dev	= {
+		.platform_data	= &keysc_info,
+	},
+	.archdata = {
+		.hwblk_id = HWBLK_KEYSC,
+	},
+};
+
 static struct platform_device *ecovec_devices[] __initdata = {
 	&heartbeat_device,
 	&nor_flash_device,
@@ -341,6 +383,7 @@ static struct platform_device *ecovec_devices[] __initdata = {
 	&lcdc_device,
 	&ceu0_device,
 	&ceu1_device,
+	&keysc_device,
 };
 
 #define EEPROM_ADDR 0x50
@@ -585,6 +628,15 @@ static int __init arch_setup(void)
 	gpio_request(GPIO_FN_VIO1_CLK, NULL);
 	platform_resource_setup_memory(&ceu1_device, "ceu1", 4 << 20);
 
+	/* enable KEYSC */
+	gpio_request(GPIO_FN_KEYOUT5_IN5, NULL);
+	gpio_request(GPIO_FN_KEYOUT4_IN6, NULL);
+	gpio_request(GPIO_FN_KEYOUT3,     NULL);
+	gpio_request(GPIO_FN_KEYOUT2,     NULL);
+	gpio_request(GPIO_FN_KEYOUT1,     NULL);
+	gpio_request(GPIO_FN_KEYOUT0,     NULL);
+	gpio_request(GPIO_FN_KEYIN0,      NULL);
+
 	/* enable I2C device */
 	i2c_register_board_info(1, i2c1_devices,
 				ARRAY_SIZE(i2c1_devices));