[PATCH V2 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
From: haojian.zhuang@gmail.com (Haojian Zhuang)
Date: 2012-03-30 02:01:48
Also in:
linux-input
On Fri, Mar 30, 2012 at 9:58 AM, Chao Xie [off-list ref] wrote:
Direct keys usage may not start from KP_DKIN0, add a msk option to configure the specifics for platforms that can skip some keys. Change-Id: Ia8fd28254fec9595dcf39f12a78392c1e8b675eb
You need remove Change-Id
quoted hunk ↗ jump to hunk
Signed-off-by: Chao Xie <redacted> --- ?arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | ? ?2 ++ ?drivers/input/keyboard/pxa27x_keypad.c ? ? ? ? | ? ?9 ++++++++- ?2 files changed, 10 insertions(+), 1 deletions(-)diff --git a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h index 7ffb16b..5ce8d5e 100644 --- a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +++ b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h@@ -46,6 +46,8 @@ struct pxa27x_keypad_platform_data {? ? ? ?unsigned int ? ?direct_key_map[MAX_DIRECT_KEY_NUM]; ? ? ? ?/* the key output may be low active */ ? ? ? ?int ? ? ? ? ? ? direct_key_low_active; + ? ? ? /* give board a chance to choose the start direct key */ + ? ? ? unsigned int ? ?direct_key_mask; ? ? ? ?/* rotary encoders 0 */ ? ? ? ?int ? ? ? ? ? ? enable_rotary0;diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index b41ebda..3da60b3 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c@@ -391,7 +391,14 @@ static void pxa27x_keypad_config(struct pxa27x_keypad *keypad)? ? ? ?if (pdata->direct_key_num > direct_key_num) ? ? ? ? ? ? ? ?direct_key_num = pdata->direct_key_num; - ? ? ? keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask; + ? ? ? /* + ? ? ? ?* Direct keys usage may not start from KP_DKIN0, check the platfrom + ? ? ? ?* mask data to config the specific. + ? ? ? ?*/ + ? ? ? if (pdata->direct_key_mask) + ? ? ? ? ? ? ? keypad->direct_key_mask = pdata->direct_key_mask; + ? ? ? else + ? ? ? ? ? ? ? keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask; ? ? ? ?/* enable direct key */ ? ? ? ?if (direct_key_num) -- 1.7.0.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel