From: eric@eukrea.com (Eric Bénard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] eukrea_mbimx27: update keyboard platform data
Date: Thu, 17 Jun 2010 20:59:02 +0200 [thread overview]
Message-ID: <1276801147-4103-2-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1276801147-4103-1-git-send-email-eric@eukrea.com>
use matrix_keypad_platform_data
enable wakeup
Signed-off-by: Eric B?nard <eric@eukrea.com>
Cc: s.hauer at pengutronix.de
Cc: linux-arm-kernel at lists.infradead.org
---
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 80f6268..e7fd65a 100644
--- a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c
+++ b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c
@@ -116,6 +116,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",
@@ -392,7 +397,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-06-17 18:59 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-17 18:59 [PATCH v2] input/imx_keypad: add PM support Eric Bénard
2010-06-17 18:59 ` Eric Bénard
2010-06-17 18:59 ` Eric Bénard [this message]
2010-06-17 18:59 ` [PATCH] eukrea_mbimx27-baseboard: fix compile when CONFIG_SPI_IMX is disabled Eric Bénard
2010-06-17 18:59 ` [PATCH v2] mtd/mxc_nand: don't call mtd->{suspend,resume} explicitly Eric Bénard
2010-06-17 18:59 ` Eric Bénard
2010-06-17 18:59 ` [PATCH] video/imxfb: fix suspend when screen is blanked Eric Bénard
2010-06-17 18:59 ` Eric Bénard
2010-06-17 18:59 ` [PATCH] mach-mx3/mach-mx31_3ds: update keypad registration Eric Bénard
2010-06-17 18:59 ` [PATCH] mxcmmc: convert to pm_ops and enable/disable clock Eric Bénard
2010-06-17 18:59 ` Eric Bénard
2010-06-17 19:22 ` [PATCH] video/imxfb: fix suspend when screen is blanked Luotao Fu
2010-06-17 19:22 ` Luotao Fu
2010-06-18 6:30 ` Eric Bénard
2010-06-18 6:30 ` Eric Bénard
2010-07-07 14:17 ` [PATCH v2] mtd/mxc_nand: don't call mtd->{suspend,resume} explicitly Artem Bityutskiy
2010-07-07 14:17 ` Artem Bityutskiy
2010-07-17 7:24 ` [PATCH v2] mtd/mxc_nand: don't call mtd->{suspend, resume} explicitly Eric Bénard
2010-07-17 7:24 ` Eric Bénard
2010-07-17 7:33 ` [PATCH v2] mtd/mxc_nand: don't call mtd->{suspend,resume} explicitly Artem Bityutskiy
2010-07-17 7:33 ` Artem Bityutskiy
2010-07-17 12:49 ` [PATCH v2] mtd/mxc_nand: don't call mtd->{suspend, resume} explicitly Eric Bénard
2010-07-17 12:49 ` Eric Bénard
2010-07-17 15:13 ` [PATCH v2] mtd/mxc_nand: don't call mtd->{suspend,resume} explicitly Artem Bityutskiy
2010-07-17 15:13 ` Artem Bityutskiy
2010-06-18 10:16 ` [PATCH v2] input/imx_keypad: add PM support Alberto Panizzo
2010-06-18 10:16 ` Alberto Panizzo
2010-06-18 14:37 ` Eric Bénard
2010-06-18 14:37 ` Eric Bénard
2010-06-18 17:40 ` Alberto Panizzo
2010-06-18 17:40 ` Alberto Panizzo
2010-06-18 17:50 ` Eric Bénard
2010-06-18 17:50 ` Eric Bénard
2010-06-24 16:39 ` Dmitry Torokhov
2010-06-24 16:39 ` Dmitry Torokhov
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=1276801147-4103-2-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.