From: anarsoul@gmail.com (Vasily Khoruzhick)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/8] ARM: PXA: Z2: Use only power button as wake source
Date: Fri, 11 Mar 2011 12:23:36 +0200 [thread overview]
Message-ID: <1299839023-16601-1-git-send-email-anarsoul@gmail.com> (raw)
It's very easy to press some keypad key when Z2 is closed,
so to prevent unexpected wakeups, use only 'Power' key to wake
Z2 from sleep.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
arch/arm/mach-pxa/z2.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index aaf8837..7bad4f7 100644
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -91,13 +91,13 @@ static unsigned long z2_pin_config[] = {
GPIO47_STUART_TXD,
/* Keypad */
- GPIO100_KP_MKIN_0 | WAKEUP_ON_LEVEL_HIGH,
- GPIO101_KP_MKIN_1 | WAKEUP_ON_LEVEL_HIGH,
- GPIO102_KP_MKIN_2 | WAKEUP_ON_LEVEL_HIGH,
- GPIO34_KP_MKIN_3 | WAKEUP_ON_LEVEL_HIGH,
- GPIO38_KP_MKIN_4 | WAKEUP_ON_LEVEL_HIGH,
- GPIO16_KP_MKIN_5 | WAKEUP_ON_LEVEL_HIGH,
- GPIO17_KP_MKIN_6 | WAKEUP_ON_LEVEL_HIGH,
+ GPIO100_KP_MKIN_0 /*| WAKEUP_ON_LEVEL_HIGH*/,
+ GPIO101_KP_MKIN_1 /*| WAKEUP_ON_LEVEL_HIGH*/,
+ GPIO102_KP_MKIN_2 /*| WAKEUP_ON_LEVEL_HIGH*/,
+ GPIO34_KP_MKIN_3 /*| WAKEUP_ON_LEVEL_HIGH*/,
+ GPIO38_KP_MKIN_4 /*| WAKEUP_ON_LEVEL_HIGH*/,
+ GPIO16_KP_MKIN_5 /*| WAKEUP_ON_LEVEL_HIGH*/,
+ GPIO17_KP_MKIN_6 /*| WAKEUP_ON_LEVEL_HIGH*/,
GPIO103_KP_MKOUT_0,
GPIO104_KP_MKOUT_1,
GPIO105_KP_MKOUT_2,
@@ -427,8 +427,8 @@ static inline void z2_mkp_init(void) {}
******************************************************************************/
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
static struct gpio_keys_button z2_pxa_buttons[] = {
- {KEY_POWER, GPIO1_ZIPITZ2_POWER_BUTTON, 0, "Power Button" },
- {KEY_CLOSE, GPIO98_ZIPITZ2_LID_BUTTON, 0, "Lid Button" },
+ {KEY_POWER, GPIO1_ZIPITZ2_POWER_BUTTON, 0, "Power Button", 1 },
+ {KEY_CLOSE, GPIO98_ZIPITZ2_LID_BUTTON, 0, "Lid Button", 0 },
};
static struct gpio_keys_platform_data z2_pxa_keys_data = {
--
1.7.4.1
next reply other threads:[~2011-03-11 10:23 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-11 10:23 Vasily Khoruzhick [this message]
2011-03-11 10:23 ` [PATCH 2/8] ARM: PXA: Z2: Enable OHCI on Zipit Z2 Vasily Khoruzhick
2011-03-11 14:56 ` [PATCH v2 " Vasily Khoruzhick
2011-03-11 21:42 ` Marek Vasut
2011-03-11 21:49 ` Vasily Khoruzhick
2011-03-11 21:50 ` Marek Vasut
2011-03-11 21:55 ` Vasily Khoruzhick
2011-03-11 22:13 ` Marek Vasut
2011-03-11 22:34 ` Vasily Khoruzhick
2011-03-12 0:07 ` Marek Vasut
2011-03-12 11:32 ` Vasily Khoruzhick
2011-03-12 13:28 ` Marek Vasut
2011-03-13 10:18 ` Pavel Machek
2011-03-13 12:29 ` Marek Vasut
2011-03-13 17:10 ` Pavel Machek
2011-03-13 18:34 ` Marek Vasut
2011-03-13 22:15 ` Vasily Khoruzhick
2011-03-11 21:41 ` [PATCH " Marek Vasut
2011-03-11 10:23 ` [PATCH 3/8] ARM: PXA: Z2: Fix battery pdata Vasily Khoruzhick
2011-03-11 21:39 ` Marek Vasut
2011-03-11 10:23 ` [PATCH 4/8] ARM: PXA: Z2: Add mtd partition with logo Vasily Khoruzhick
2011-03-11 21:39 ` Marek Vasut
2011-03-11 22:31 ` Vasily Khoruzhick
2011-03-12 0:05 ` Marek Vasut
2011-03-15 14:39 ` Pavel Machek
2011-03-16 14:11 ` Marek Vasut
2011-03-16 16:51 ` Pavel Machek
2011-03-11 10:23 ` [PATCH 5/8] ARM: PXA: Z2: Add poweroff function Vasily Khoruzhick
2011-03-11 21:39 ` Marek Vasut
2011-03-11 21:53 ` Vasily Khoruzhick
2011-03-11 22:08 ` Marek Vasut
2011-03-11 22:12 ` Vasily Khoruzhick
2011-03-11 22:16 ` Marek Vasut
2011-03-11 22:30 ` Vasily Khoruzhick
2011-03-12 0:05 ` Marek Vasut
2011-03-12 2:29 ` Eric Miao
2011-03-12 8:06 ` Vasily Khoruzhick
2011-03-12 11:06 ` Marek Vasut
2011-03-12 11:30 ` Vasily Khoruzhick
2011-03-12 13:16 ` Marek Vasut
2011-03-12 20:33 ` Vasily Khoruzhick
2011-03-12 20:35 ` Marek Vasut
2011-03-12 20:34 ` Vasily Khoruzhick
2011-03-12 22:29 ` Marek Vasut
2011-03-15 15:49 ` Eric Miao
2011-03-15 15:57 ` Vasily Khoruzhick
2011-03-15 16:42 ` Eric Miao
2011-03-15 20:11 ` [PATCH v2] " Vasily Khoruzhick
2011-07-05 6:58 ` Eric Miao
2011-03-15 14:41 ` [PATCH 5/8] " Pavel Machek
2011-03-11 10:23 ` [PATCH 6/8] ARM: PXA: Z2: Fix libertas init/tear down sequences Vasily Khoruzhick
2011-03-11 21:37 ` Marek Vasut
2011-03-11 21:41 ` Vasily Khoruzhick
2011-03-11 21:51 ` Marek Vasut
2011-03-11 10:23 ` [PATCH 7/8] ARM: PXA: Z2: Keep kbd backlight disabled by default Vasily Khoruzhick
2011-03-11 21:36 ` Marek Vasut
2011-03-11 10:23 ` [PATCH 8/8] ARM: PXA: Z2: Add default triggers for LEDs Vasily Khoruzhick
2011-03-11 21:36 ` Marek Vasut
2011-03-11 21:43 ` [PATCH 1/8] ARM: PXA: Z2: Use only power button as wake source Marek Vasut
2011-03-13 10:15 ` Pavel Machek
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=1299839023-16601-1-git-send-email-anarsoul@gmail.com \
--to=anarsoul@gmail.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).