diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 12:59:42 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 12:59:42 +0900 |
| commit | 60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d (patch) | |
| tree | b19755368b6d0f6be3024d972de13f4b48cb025d /arch/sh/boards/mach-se | |
| parent | 180aa6e6aa11922dcd4c13df1967d62bb2ede76c (diff) | |
| parent | 237674e050ae8ea40a432412df6c15d60b7ae8a6 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/boards/mach-se')
| -rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 36a4ca3a900..9162081504e 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -246,7 +246,7 @@ static struct platform_device ceu1_device = { }, }; -/* KEYSC */ +/* KEYSC in SoC (Needs SW33-2 set to ON) */ static struct sh_keysc_info keysc_info = { .mode = SH_KEYSC_MODE_1, .scan_timing = 10, @@ -263,12 +263,13 @@ static struct sh_keysc_info keysc_info = { static struct resource keysc_resources[] = { [0] = { - .start = 0x1a204000, - .end = 0x1a20400f, + .name = "KEYSC", + .start = 0x044b0000, + .end = 0x044b000f, .flags = IORESOURCE_MEM, }, [1] = { - .start = IRQ0_KEY, + .start = 79, .flags = IORESOURCE_IRQ, }, }; |