From: eric@eukrea.com (Eric Bénard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/5] eukrea_mbimx27: update keyboard platform data
Date: Fri, 21 May 2010 13:12:42 +0200 [thread overview]
Message-ID: <1274440363-435-4-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1274440363-435-3-git-send-email-eric@eukrea.com>
* use matrix_keypad_platform_data
* enable wakeup
Signed-off-by: Eric B?nard <eric@eukrea.com>
---
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c
index 34bdc26..9038e1f 100644
--- a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c
+++ b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c
@@ -107,6 +107,11 @@ static struct matrix_keymap_data eukrea_mbimx27_keymap_data = {
.keymap_size = ARRAY_SIZE(eukrea_mbimx27_keymap),
};
+static struct matrix_keypad_platform_data eukrea_mbimx27_keypad_data = {
+ .keymap_data = &eukrea_mbimx27_keymap_data,
+ .wakeup = 1,
+};
+
static struct gpio_led gpio_leds[] = {
{
.name = "led1",
@@ -350,7 +355,7 @@ void __init eukrea_mbimx27_baseboard_init(void)
gpio_request(GPIO_PORTA | 25, "lcd_enable");
platform_device_register(&eukrea_mbimx27_lcd_powerdev);
- mxc_register_device(&imx_kpp_device, &eukrea_mbimx27_keymap_data);
+ mxc_register_device(&imx_kpp_device, &eukrea_mbimx27_keypad_data);
platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
}
--
1.6.3.3
next prev parent reply other threads:[~2010-05-21 11:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-21 11:12 [PATCH 1/5] i.MX27: add suspend to RAM support Eric Bénard
2010-05-21 11:12 ` [PATCH 2/5] mxc_nand: fix PM Eric Bénard
2010-05-21 11:12 ` [PATCH 3/5] imx_keypad: add PM support Eric Bénard
2010-05-21 11:12 ` Eric Bénard [this message]
2010-05-21 11:12 ` [PATCH 5/5] serial/imx.c: fix suspend/resume Eric Bénard
2010-05-21 19:22 ` [PATCH 3/5] imx_keypad: add PM support Russell King - ARM Linux
2010-05-21 11:41 ` [PATCH 2/5] mxc_nand: fix PM Lothar Waßmann
2010-05-21 12:32 ` Eric Bénard
2010-05-21 13:10 ` Wolfram Sang
2010-05-21 13:22 ` Eric Bénard
2010-05-24 21:10 ` Uwe Kleine-König
2010-05-24 21:16 ` Eric Bénard
2010-05-21 12:02 ` [PATCH 1/5] i.MX27: add suspend to RAM support Lothar Waßmann
2010-05-21 19:19 ` Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1274440363-435-4-git-send-email-eric@eukrea.com \
--to=eric@eukrea.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).