Commit 587d8628 authored by David Herrmann's avatar David Herrmann Committed by Andy Shevchenko

platform/x86: thinkpad_acpi: suppress warning about palm detection

This patch prevents the thinkpad_acpi driver from warning about 2 event
codes returned for keyboard palm-detection. No behavioral changes,
other than suppressing the warning in the kernel log. The events are
still forwarded via acpi-netlink channels.

We could, optionally, decide to forward the event through a
input-switch on the tpacpi input device. However, so far no suitable
input-code exists, and no similar drivers report such events. Hence,
leave it an acpi event for now.

Note that the event-codes are named based on empirical studies. On the
ThinkPad X1 5th Gen the sensor can be found underneath the arrow key.

Cc: Matthew Thode <mthode@mthode.org>
Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Acked-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 4245c155
...@@ -214,6 +214,10 @@ enum tpacpi_hkey_event_t { ...@@ -214,6 +214,10 @@ enum tpacpi_hkey_event_t {
/* AC-related events */ /* AC-related events */
TP_HKEY_EV_AC_CHANGED = 0x6040, /* AC status changed */ TP_HKEY_EV_AC_CHANGED = 0x6040, /* AC status changed */
/* Further user-interface events */
TP_HKEY_EV_PALM_DETECTED = 0x60b0, /* palm hoveres keyboard */
TP_HKEY_EV_PALM_UNDETECTED = 0x60b1, /* palm removed */
/* Misc */ /* Misc */
TP_HKEY_EV_RFKILL_CHANGED = 0x7000, /* rfkill switch changed */ TP_HKEY_EV_RFKILL_CHANGED = 0x7000, /* rfkill switch changed */
}; };
...@@ -4077,6 +4081,12 @@ static bool hotkey_notify_6xxx(const u32 hkey, ...@@ -4077,6 +4081,12 @@ static bool hotkey_notify_6xxx(const u32 hkey,
*send_acpi_ev = false; *send_acpi_ev = false;
break; break;
case TP_HKEY_EV_PALM_DETECTED:
case TP_HKEY_EV_PALM_UNDETECTED:
/* palm detected hovering the keyboard, forward to user-space
* via netlink for consumption */
return true;
default: default:
pr_warn("unknown possible thermal alarm or keyboard event received\n"); pr_warn("unknown possible thermal alarm or keyboard event received\n");
known = false; known = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment