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
commit99b55a88fe46b33814d1ca4971be93008e677888 (patch)
treedd126923d7db9cb5f8fb4d54f3c20b4bd2b1134b /arch
parent9ae31a3ccb5c11abda52f344158816c1f1e9a10b (diff)
ENGR00123072-3 MX31: Add keypad mem resource
Add keypad memory resource in MX31 3-stack platform Signed-off-by: Lily Zhang <r58066@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx3/mx3_3stack.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/mx3_3stack.c b/arch/arm/mach-mx3/mx3_3stack.c
index 4a97f688a75d..4164f62a0be5 100644
--- a/arch/arm/mach-mx3/mx3_3stack.c
+++ b/arch/arm/mach-mx3/mx3_3stack.c
@@ -92,13 +92,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 = 3,
.colmax = 4,
- .irq = MXC_INT_KPP,
.learning = 0,
.delay = 2,
.matrix = keymapping,