aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-05-19 12:46:06 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2010-07-26 08:17:48 -0400
commit0896a9e5ed2616e2c41d3bd9cbb265251fbc733a (patch)
treeab69848a3361e8d9700591b9e28c8a85e8e032a0
parente76a17c2d9c7f91d3ee6469568535189e1c201ca (diff)
MX2X: Add Keypad device definition for MX2X arch
Based on work from Alberto Panizzo for MX3X Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-mx2/devices.c18
-rw-r--r--arch/arm/mach-mx2/devices.h1
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c
index a0aeb8a4adc..4df2e340652 100644
--- a/arch/arm/mach-mx2/devices.c
+++ b/arch/arm/mach-mx2/devices.c
@@ -501,3 +501,21 @@ struct platform_device mx21_usbhc_device = {
501}; 501};
502#endif 502#endif
503 503
504static struct resource imx_kpp_resources[] = {
505 {
506 .start = MX2x_KPP_BASE_ADDR,
507 .end = MX2x_KPP_BASE_ADDR + 0xf,
508 .flags = IORESOURCE_MEM
509 }, {
510 .start = MX2x_INT_KPP,
511 .end = MX2x_INT_KPP,
512 .flags = IORESOURCE_IRQ,
513 },
514};
515
516struct platform_device imx_kpp_device = {
517 .name = "imx-keypad",
518 .id = -1,
519 .num_resources = ARRAY_SIZE(imx_kpp_resources),
520 .resource = imx_kpp_resources,
521};
diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h
index 84ed5138017..cd4977990bd 100644
--- a/arch/arm/mach-mx2/devices.h
+++ b/arch/arm/mach-mx2/devices.h
@@ -40,3 +40,4 @@ extern struct platform_device mxc_spi_device2;
40extern struct platform_device mx21_usbhc_device; 40extern struct platform_device mx21_usbhc_device;
41extern struct platform_device imx_ssi_device0; 41extern struct platform_device imx_ssi_device0;
42extern struct platform_device imx_ssi_device1; 42extern struct platform_device imx_ssi_device1;
43extern struct platform_device imx_kpp_device;