2018-10-11 05:55:03

by Zhang Xianwei

[permalink] [raw]
Subject: [PATCH] platform/x86: thinkpad_acpi: Change the keymap for Favorites hotkey

The keycode KEY_FAVORITES(0x16c) used in thinkpad_acpi driver is too
big (out of range > 255) for xorg to handle.
xkeyboard-config has already mapped KEY_BOOKMARKS(156) to
XF86Favorites:

keycodes/evdev:
<I164> = 164; // #define KEY_BOOKMARKS 156

symbols/inet:
key <I164> { [ XF86Favorites ] };

So change the keymap to KEY_BOOKMARKS for Favorites hotkey.

Signed-off-by: Zhang Xianwei <[email protected]>
---
drivers/platform/x86/thinkpad_acpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index fde08a9..a86cf47 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3457,7 +3457,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
KEY_UNKNOWN,

- KEY_FAVORITES, /* Favorite app, 0x311 */
+ KEY_BOOKMARKS, /* Favorite app, 0x311 */
KEY_RESERVED, /* Clipping tool */
KEY_CALC, /* Calculator (above numpad, P52) */
KEY_BLUETOOTH, /* Bluetooth */
--
2.9.5



2018-10-29 13:52:08

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH] platform/x86: thinkpad_acpi: Change the keymap for Favorites hotkey

On Thu, Oct 18, 2018 at 5:30 AM <[email protected]> wrote:
>
> Could you take a little time to review the patch? Thanks
>

Pushed to my review and testing queue, thanks!


> ------------------Original Mail------------------
> Sender: zhang xianwei10129966
> To: [email protected] <[email protected]>[email protected] <[email protected]>[email protected] <[email protected]>
> CC: [email protected] <[email protected]>[email protected] <[email protected]>[email protected] <[email protected]>zhong weidong10001088;zhang xianwei10129966;
> Date: 2018/10/11 13:52
> Subject: [PATCH] platform/x86: thinkpad_acpi: Change the keymap for Favorites hotkey
> The keycode KEY_FAVORITES(0x16c) used in thinkpad_acpi driver is too
> big (out of range > 255) for xorg to handle.
> xkeyboard-config has already mapped KEY_BOOKMARKS(156) to
> XF86Favorites:
>
> keycodes/evdev:
> <I164> = 164; // #define KEY_BOOKMARKS 156
>
> symbols/inet:
> key <I164> { [ XF86Favorites ] };
>
> So change the keymap to KEY_BOOKMARKS for Favorites hotkey.
>
> Signed-off-by: Zhang Xianwei <[email protected]>
> ---
> drivers/platform/x86/thinkpad_acpi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index fde08a9..a86cf47 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -3457,7 +3457,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
> KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
> KEY_UNKNOWN,
> - KEY_FAVORITES, /* Favorite app, 0x311 */
> + KEY_BOOKMARKS, /* Favorite app, 0x311 */
> KEY_RESERVED, /* Clipping tool */
> KEY_CALC, /* Calculator (above numpad, P52) */
> KEY_BLUETOOTH, /* Bluetooth */
> --
> 2.9.5



--
With Best Regards,
Andy Shevchenko