From patchwork Fri Nov 27 07:32:24 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Magnus Damm <magnus.damm@gmail.com>
X-Patchwork-Id: 63292
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 nAR7bjkM023625
	for <patchwork-sh@patchwork.kernel.org>; Fri, 27 Nov 2009 07:37:53 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751234AbZK0Hhp (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Fri, 27 Nov 2009 02:37:45 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752410AbZK0Hhp
	(ORCPT <rfc822; linux-sh-outgoing>);
	Fri, 27 Nov 2009 02:37:45 -0500
Received: from mail-yx0-f188.google.com ([209.85.210.188]:35969 "EHLO
	mail-yx0-f188.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751007AbZK0Hho (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Fri, 27 Nov 2009 02:37:44 -0500
Received: by yxe26 with SMTP id 26so1153529yxe.4
	for <multiple recipients>; Thu, 26 Nov 2009 23:37:50 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:cc:date:message-id
	:subject; bh=+whTvrxnxhlmGFZRV9L8MdMANi7YVCzGw+FZiZ5QZIg=;
	b=U2x3gSVtansDkRkf6PmTO7FAh0pl5DGvFcKwmqSX2Ippk0+wnWiEKzGWBo98PSNHms
	aq3sVyH5EHec5Ln9reNI7++qX8AINBVNMNz17njgyNmLICuiFOxzZOdhCj38FE8BSthu
	nOvmwAG2uSpCLQiHLvIW249hsCA3gJjQ3miUc=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:date:message-id:subject;
	b=TD76bqLjne+oZ+7qsKkfQ91VQFAVKNF0K+B/yvhkRn0WYeCwhOCmMx5EQZAWS2ysRN
	v0OeaLbf1oitvVFnt37tIG3oypEJYuEREtp73Qck/P1TO+bYT9GVaFpv96nWYQ5pe/+J
	4nthicF9gmzNM0HXhONjJ9IQmjXkD8xtpSP1Q=
Received: by 10.150.250.2 with SMTP id x2mr1128005ybh.65.1259307469991;
	Thu, 26 Nov 2009 23:37:49 -0800 (PST)
Received: from rxone.opensource.se (49.14.32.202.bf.2iij.net [202.32.14.49])
	by mx.google.com with ESMTPS id 6sm527154ywc.54.2009.11.26.23.37.48
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Thu, 26 Nov 2009 23:37:49 -0800 (PST)
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Cc: Magnus Damm <magnus.damm@gmail.com>, lethal@linux-sh.org,
	linux-input@vger.kernel.org
Date: Fri, 27 Nov 2009 16:32:24 +0900
Message-Id: <20091127073224.19786.60477.sendpatchset@rxone.opensource.se>
Subject: [PATCH] sh: Move KEYSC header file
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org


--- 0003/arch/sh/boards/mach-ecovec24/setup.c
+++ work/arch/sh/boards/mach-ecovec24/setup.c	2009-11-27 15:28:14.000000000 +0900
@@ -20,12 +20,12 @@
 #include <linux/i2c.h>
 #include <linux/i2c/tsc2007.h>
 #include <linux/input.h>
+#include <linux/input/sh_keysc.h>
 #include <linux/mfd/sh_mobile_sdhi.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 <asm/clock.h>
 #include <asm/suspend.h>
 #include <cpu/sh7724.h>
--- 0001/arch/sh/boards/mach-kfr2r09/setup.c
+++ work/arch/sh/boards/mach-kfr2r09/setup.c	2009-11-27 15:27:42.000000000 +0900
@@ -16,6 +16,7 @@
 #include <linux/clk.h>
 #include <linux/gpio.h>
 #include <linux/input.h>
+#include <linux/input/sh_keysc.h>
 #include <linux/i2c.h>
 #include <linux/usb/r8a66597.h>
 #include <media/soc_camera.h>
@@ -25,7 +26,6 @@
 #include <asm/clock.h>
 #include <asm/machvec.h>
 #include <asm/io.h>
-#include <asm/sh_keysc.h>
 #include <cpu/sh7724.h>
 #include <mach/kfr2r09.h>
 
--- 0001/arch/sh/boards/mach-migor/setup.c
+++ work/arch/sh/boards/mach-migor/setup.c	2009-11-27 15:28:55.000000000 +0900
@@ -11,6 +11,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
+#include <linux/input/sh_keysc.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/nand.h>
 #include <linux/i2c.h>
@@ -25,7 +26,6 @@
 #include <asm/clock.h>
 #include <asm/machvec.h>
 #include <asm/io.h>
-#include <asm/sh_keysc.h>
 #include <asm/suspend.h>
 #include <mach/migor.h>
 #include <cpu/sh7722.h>
--- 0001/arch/sh/boards/mach-se/7722/setup.c
+++ work/arch/sh/boards/mach-se/7722/setup.c	2009-11-27 16:00:13.000000000 +0900
@@ -14,6 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/ata_platform.h>
 #include <linux/input.h>
+#include <linux/input/sh_keysc.h>
 #include <linux/smc91x.h>
 #include <mach-se/mach/se7722.h>
 #include <mach-se/mach/mrshpc.h>
@@ -21,7 +22,6 @@
 #include <asm/clock.h>
 #include <asm/io.h>
 #include <asm/heartbeat.h>
-#include <asm/sh_keysc.h>
 #include <cpu/sh7722.h>
 
 /* Heartbeat */
--- 0001/arch/sh/boards/mach-se/7724/setup.c
+++ work/arch/sh/boards/mach-se/7724/setup.c	2009-11-27 15:27:28.000000000 +0900
@@ -19,6 +19,7 @@
 #include <linux/smc91x.h>
 #include <linux/gpio.h>
 #include <linux/input.h>
+#include <linux/input/sh_keysc.h>
 #include <linux/usb/r8a66597.h>
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
@@ -27,7 +28,6 @@
 #include <asm/heartbeat.h>
 #include <asm/sh_eth.h>
 #include <asm/clock.h>
-#include <asm/sh_keysc.h>
 #include <asm/suspend.h>
 #include <cpu/sh7724.h>
 #include <mach-se/mach/se7724.h>
--- 0001/arch/sh/include/asm/sh_keysc.h
+++ /dev/null	2009-11-24 12:00:12.283019273 +0900
@@ -1,14 +0,0 @@
-#ifndef __ASM_KEYSC_H__
-#define __ASM_KEYSC_H__
-
-#define SH_KEYSC_MAXKEYS 30
-
-struct sh_keysc_info {
-	enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3 } mode;
-	int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */
-	int delay;
-	int kycr2_delay;
-	int keycodes[SH_KEYSC_MAXKEYS];
-};
-
-#endif /* __ASM_KEYSC_H__ */
--- 0001/drivers/input/keyboard/sh_keysc.c
+++ work/drivers/input/keyboard/sh_keysc.c	2009-11-27 15:29:03.000000000 +0900
@@ -18,9 +18,9 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
+#include <linux/input/sh_keysc.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <asm/sh_keysc.h>
 
 #define KYCR1_OFFS   0x00
 #define KYCR2_OFFS   0x04
--- /dev/null
+++ work/include/linux/input/sh_keysc.h	2009-11-24 19:14:53.000000000 +0900
@@ -0,0 +1,14 @@
+#ifndef __SH_KEYSC_H__
+#define __SH_KEYSC_H__
+
+#define SH_KEYSC_MAXKEYS 30
+
+struct sh_keysc_info {
+	enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3 } mode;
+	int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */
+	int delay;
+	int kycr2_delay;
+	int keycodes[SH_KEYSC_MAXKEYS];
+};
+
+#endif /* __SH_KEYSC_H__ */