summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLily Zhang <r58066@freescale.com>2010-04-30 17:48:03 +0800
committerLily Zhang <r58066@freescale.com>2010-05-04 10:33:45 +0800
commit9ae31a3ccb5c11abda52f344158816c1f1e9a10b (patch)
treedc7c6caa13b91b34ce5bcc1fb876575de9399d14 /arch
parentd9a7592f38ec4acdcd9cb43d26179ffacdd951ed (diff)
ENGR00123072-2 MX25: Add Keypad mem resource
Add Keypad mem resource in MX25 platform Signed-off-by: Lily Zhang <r58066@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx25/mx25_3stack.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-mx25/mx25_3stack.c b/arch/arm/mach-mx25/mx25_3stack.c
index 557447964d09..30b4cbd178bd 100644
--- a/arch/arm/mach-mx25/mx25_3stack.c
+++ b/arch/arm/mach-mx25/mx25_3stack.c
@@ -100,13 +100,17 @@ static struct resource mxc_kpp_resources[] = {
.start = MXC_INT_KPP,
.end = MXC_INT_KPP,
.flags = IORESOURCE_IRQ,
- }
+ },
+ [1] = {
+ .start = KPP_BASE_ADDR,
+ .end = KPP_BASE_ADDR + SZ_4K - 1,
+ .flags = IORESOURCE_MEM,
+ },
};
static struct keypad_data keypad_plat_data = {
.rowmax = 4,
.colmax = 4,
- .irq = MXC_INT_KPP,
.learning = 0,
.delay = 2,
.matrix = keymapping,