From 9c2b72065dccd3bd915052a618f05d4bd7bfa308 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 23 Apr 2019 15:05:28 +0200 Subject: [PATCH 1/4] hwdb: Make the OLPC XO rules also match XO-1.75 Uses the same keyboard, attached to the "Security Processor" P1J core that bit-bangs the PS/2 keyboard protocol. --- hwdb/60-keyboard.hwdb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index 71aecd8a53..daf8f12ac4 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -1036,8 +1036,10 @@ evdev:name:MSI Laptop hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnM[iI][cC][rR][oO]-S[tT][a # OLPC ########################################################### -# XO +# XO-1 and XO-1.5 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnOLPC:pnXO:* +# XO-1.75 and XO-1.4 (sp/ is the Security Processor) +evdev:name:AT Translated Set 2 keyboard:phys:sp/serio*/input*:ev:120013:* KEYBOARD_KEY_59=fn KEYBOARD_KEY_81=fn_esc KEYBOARD_KEY_f9=camera From 740bdfea87876ca71bf91a1adedab6553d0326d1 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 23 Apr 2019 15:08:53 +0200 Subject: [PATCH 2/4] hwdb: No LEDs on the OLPC XO keyboard --- hwdb/60-keyboard.hwdb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index daf8f12ac4..92341f6c97 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -1040,6 +1040,8 @@ evdev:name:MSI Laptop hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnM[iI][cC][rR][oO]-S[tT][a evdev:atkbd:dmi:bvn*:bvr*:bd*:svnOLPC:pnXO:* # XO-1.75 and XO-1.4 (sp/ is the Security Processor) evdev:name:AT Translated Set 2 keyboard:phys:sp/serio*/input*:ev:120013:* + KEYBOARD_LED_CAPSLOCK=0 + KEYBOARD_LED_NUMLOCK=0 KEYBOARD_KEY_59=fn KEYBOARD_KEY_81=fn_esc KEYBOARD_KEY_f9=camera From 1430e4b65332d0dab71a07d6dd532e2fdeb461b7 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 23 Apr 2019 15:09:04 +0200 Subject: [PATCH 3/4] hwdb: Fix the OLPC XO rotate key The comment is incorrect -- this key code is sent by the rotate button, the brightness keys are separate. --- hwdb/60-keyboard.hwdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index 92341f6c97..39b2f5cac5 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -1086,7 +1086,7 @@ evdev:name:AT Translated Set 2 keyboard:phys:sp/serio*/input*:ev:120013:* KEYBOARD_KEY_dc=rightmeta # right grab KEYBOARD_KEY_85=rightmeta # Right grab releases on a different scancode KEYBOARD_KEY_d6=kbdillumtoggle # Fn+Space - KEYBOARD_KEY_69=switchvideomode # Brightness key + KEYBOARD_KEY_69=rotate_display KEYBOARD_KEY_65=kp8 # up KEYBOARD_KEY_66=kp2 # down KEYBOARD_KEY_67=kp4 # left From 0533cf4371f2329dbaa3b91fee4b79122fb7bd4f Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 23 Apr 2019 15:09:17 +0200 Subject: [PATCH 4/4] hwdb: Fix the key codes of the OLPC XO button pad These are not on a key pad. These codes are sent by the "rocker" buttons that resemble a game pad. --- hwdb/60-keyboard.hwdb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index 39b2f5cac5..4762c68a1b 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -1087,14 +1087,14 @@ evdev:name:AT Translated Set 2 keyboard:phys:sp/serio*/input*:ev:120013:* KEYBOARD_KEY_85=rightmeta # Right grab releases on a different scancode KEYBOARD_KEY_d6=kbdillumtoggle # Fn+Space KEYBOARD_KEY_69=rotate_display - KEYBOARD_KEY_65=kp8 # up - KEYBOARD_KEY_66=kp2 # down - KEYBOARD_KEY_67=kp4 # left - KEYBOARD_KEY_68=kp6 # right - KEYBOARD_KEY_e5=kp9 # pgup - KEYBOARD_KEY_e6=kp3 # pgdn - KEYBOARD_KEY_e7=kp7 # home - KEYBOARD_KEY_e8=kp1 # end + KEYBOARD_KEY_65=btn_dpad_up + KEYBOARD_KEY_66=btn_dpad_down + KEYBOARD_KEY_67=btn_dpad_left + KEYBOARD_KEY_68=btn_dpad_right + KEYBOARD_KEY_e5=btn_north + KEYBOARD_KEY_e6=btn_south + KEYBOARD_KEY_e7=btn_west + KEYBOARD_KEY_e8=btn_east ########################################################### # Onkyo