diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 13:54:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 13:54:26 -0700 |
commit | b9d030a123b6b7fbf262c995455197ea5184b497 (patch) | |
tree | 9e98829c9c79b4085c762fe6fa00c6bb6f49e8f6 /arch/sh/boards/mach-se/7724/setup.c | |
parent | 435a71d9ef68b03343949c814986e01dae849763 (diff) | |
parent | 237674e050ae8ea40a432412df6c15d60b7ae8a6 (diff) | |
download | linux-b9d030a123b6b7fbf262c995455197ea5184b497.tar.gz linux-b9d030a123b6b7fbf262c995455197ea5184b497.tar.bz2 linux-b9d030a123b6b7fbf262c995455197ea5184b497.zip |
Merge branch 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: sh7724 ddr self-refresh changes
sh: use in-soc KEYSC on se7724
sh: CMT suspend/resume
sh: skip disabled LCDC channels
Diffstat (limited to 'arch/sh/boards/mach-se/7724/setup.c')
-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 8fed45a2fb85..15456a0773bf 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -238,7 +238,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, @@ -255,12 +255,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, }, }; |