* [PATCH] sh: Move KEYSC header file
@ 2009-11-27 7:32 ` Magnus Damm
2009-11-28 1:43 ` Dmitry Torokhov
[not found] ` <20091127051621.24738.14619.sendpatchset@rxone.opensource.se>
0 siblings, 2 replies; 3+ messages in thread
From: Magnus Damm @ 2009-11-27 7:32 UTC (permalink / raw)
To: linux-sh; +Cc: Magnus Damm, lethal, linux-input
From: Magnus Damm <damm@opensource.se>
This patch moves the KEYSC header file from the
SuperH specific asm directory to a place where
it can be shared by multiple architectures.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/sh/boards/mach-ecovec24/setup.c | 2 +-
arch/sh/boards/mach-kfr2r09/setup.c | 2 +-
arch/sh/boards/mach-migor/setup.c | 2 +-
arch/sh/boards/mach-se/7722/setup.c | 2 +-
arch/sh/boards/mach-se/7724/setup.c | 2 +-
arch/sh/include/asm/sh_keysc.h | 14 --------------
drivers/input/keyboard/sh_keysc.c | 2 +-
include/linux/input/sh_keysc.h | 14 ++++++++++++++
8 files changed, 20 insertions(+), 20 deletions(-)
--- 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__ */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] sh: Move KEYSC header file
2009-11-27 7:32 ` [PATCH] sh: Move KEYSC header file Magnus Damm
@ 2009-11-28 1:43 ` Dmitry Torokhov
[not found] ` <20091127051621.24738.14619.sendpatchset@rxone.opensource.se>
1 sibling, 0 replies; 3+ messages in thread
From: Dmitry Torokhov @ 2009-11-28 1:43 UTC (permalink / raw)
To: Magnus Damm; +Cc: linux-sh, lethal, linux-input
On Fri, Nov 27, 2009 at 04:32:24PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
>
> This patch moves the KEYSC header file from the
> SuperH specific asm directory to a place where
> it can be shared by multiple architectures.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
No oobjections on my part...
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mfd: Add power control platform data to SDHI driver
[not found] ` <20091127043127.13567.23641.sendpatchset@rxone.opensource.se>
@ 2009-11-30 3:05 ` Paul Mundt
0 siblings, 0 replies; 3+ messages in thread
From: Paul Mundt @ 2009-11-30 3:05 UTC (permalink / raw)
To: Magnus Damm; +Cc: linux-sh, ian, sameo, linux-input
On Fri, Nov 27, 2009 at 01:31:27PM +0900, Magnus Damm wrote:
> This patch adds platform data with a function for power
> control to the SDHI driver. The idea is that board specific
> code can provide their own functions so power can be enabled
> and disabled for the sd-cards.
On Fri, Nov 27, 2009 at 01:36:58PM +0900, Magnus Damm wrote:
> This patch adds support for SDHI power control to the
> Ecovec board. Platform data and power control callbacks
> for SDHI0 and SDHI1 are added. Power is by default off.
On Fri, Nov 27, 2009 at 02:16:21PM +0900, Magnus Damm wrote:
> Add sh7724 code to save and restore CPG state during
> R-standby. Only CPG registers IRDACLKCR and SPUCLKCR
> require software save and restore.
On Fri, Nov 27, 2009 at 04:32:24PM +0900, Magnus Damm wrote:
> This patch moves the KEYSC header file from the
> SuperH specific asm directory to a place where
> it can be shared by multiple architectures.
On Fri, Nov 27, 2009 at 04:38:01PM +0900, Magnus Damm wrote:
> This file breaks out the SuperH PFC code from
> arch/sh/kernel/gpio.c + arch/sh/include/asm/gpio.h
> to drivers/sh/pfc.c + include/linux/sh_pfc.h.
>
> Similar to the INTC stuff. The non-SuperH specific
> file location makes it possible to share the code
> between multiple architectures.
On Fri, Nov 27, 2009 at 06:28:03PM +0900, Magnus Damm wrote:
> This patch improves the serial port communication quality
> of port YC401 on the KFR2R09 board. With this fix serial
> console is fine at 115200 - up and down keys now work as
> expected. Thanks to Hirohide Yamasaki for this fix.
All applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-11-30 3:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20091127092803.9204.29222.sendpatchset@rxone.opensource.se>
[not found] ` <20091127073801.19796.38165.sendpatchset@rxone.opensource.se>
2009-11-27 7:32 ` [PATCH] sh: Move KEYSC header file Magnus Damm
2009-11-28 1:43 ` Dmitry Torokhov
[not found] ` <20091127051621.24738.14619.sendpatchset@rxone.opensource.se>
[not found] ` <20091127043658.13573.80166.sendpatchset@rxone.opensource.se>
[not found] ` <20091127043127.13567.23641.sendpatchset@rxone.opensource.se>
2009-11-30 3:05 ` [PATCH] mfd: Add power control platform data to SDHI driver Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).