aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2016-04-30 11:37:55 +0200
committerAndrea Adami <andrea.adami@gmail.com>2016-05-06 15:06:54 +0200
commitf0954a822c46f1691f1a2f0d157925f2b6ddbaa9 (patch)
treebda628b23b9d0042d970c7ddc981d660fb0cb80f
parent3e9688101c2e4ee188a2e700ad5868c295ecb186 (diff)
downloadmeta-handheld-f0954a822c46f1691f1a2f0d157925f2b6ddbaa9.zip
meta-handheld-f0954a822c46f1691f1a2f0d157925f2b6ddbaa9.tar.gz
meta-handheld-f0954a822c46f1691f1a2f0d157925f2b6ddbaa9.tar.bz2
linux-handheld_4.4: readd LOCOMO_KEY_CENTER
After the rework of the locomokbd driver the key is mapped to KEY_F15. Remap it to KEY_F5 as done by the 2.6 locomokbd hack. Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/locomo/0090-locomokbd.c-fix-missing-KEY_CENTER.patch39
-rw-r--r--recipes-kernel/linux/linux-handheld_4.4.bb2
2 files changed, 41 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-handheld-4.4/locomo/0090-locomokbd.c-fix-missing-KEY_CENTER.patch b/recipes-kernel/linux/linux-handheld-4.4/locomo/0090-locomokbd.c-fix-missing-KEY_CENTER.patch
new file mode 100644
index 0000000..79f614a
--- /dev/null
+++ b/recipes-kernel/linux/linux-handheld-4.4/locomo/0090-locomokbd.c-fix-missing-KEY_CENTER.patch
@@ -0,0 +1,39 @@
+From 81161968b08d8adf1a70cc3b9dc8b82ede4d6e36 Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Thu, 28 Apr 2016 22:06:26 +0200
+Subject: [PATCH 1/1] locomokbd.c: fix missing KEY_CENTER
+
+The select/center key on keypad is defined as KEY_F15 (185) as default.
+Unbind it assigning LOCOMO_KEY_CENTER to KEY_F5 as done in the previous
+2.6 hack.
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ drivers/input/keyboard/locomokbd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
+index f0e86c6..6e8499b 100644
+--- a/drivers/input/keyboard/locomokbd.c
++++ b/drivers/input/keyboard/locomokbd.c
+@@ -38,7 +38,7 @@
+
+ #define KEY_ACTIVITY KEY_F16
+ #define KEY_CONTACT KEY_F18
+-#define KEY_CENTER KEY_F15
++#define LOCOMO_KEY_CENTER KEY_F5
+
+ #ifdef CONFIG_KEYBOARD_LOCOMOKBD_SYSRQ
+ #define LOCOMO_KEY_CONTACT KEY_LEFTALT
+@@ -58,7 +58,7 @@ locomokbd_keycode[LOCOMOKBD_NUMKEYS] = {
+ 0, KEY_ESC, KEY_ACTIVITY, 0, 0, 0, 0, 0, 0, 0, /* 0 - 9 */
+ 0, 0, 0, 0, 0, 0, 0, KEY_MENU, 0, LOCOMO_KEY_CONTACT, /* 10 - 19 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 20 - 29 */
+- 0, 0, 0, KEY_CENTER, 0, KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */
++ 0, 0, 0, LOCOMO_KEY_CENTER, 0, KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */
+ KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */
+ KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, KEY_KPENTER, 0, 0, /* 60 - 69 */
+--
+1.9.1
+
diff --git a/recipes-kernel/linux/linux-handheld_4.4.bb b/recipes-kernel/linux/linux-handheld_4.4.bb
index c490418..c4ec006 100644
--- a/recipes-kernel/linux/linux-handheld_4.4.bb
+++ b/recipes-kernel/linux/linux-handheld_4.4.bb
@@ -49,6 +49,8 @@ LOCOMO_PATCHES = "\
file://locomo/0039-XXX-don-t-emit-added-moved-or-deleted-file-warning.patch \
file://locomo/0040-input-locomokbd-provide-an-Alt-SysRQ-combination.patch \
"
+LOCOMO_PATCHES += "file://locomo/0090-locomokbd.c-fix-missing-KEY_CENTER.patch"
+
SRC_URI_append_akita = " \
file://defconfig \
file://OE-vga-logo.patch \