summaryrefslogtreecommitdiff
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2024-01-05 19:03:06 -0800
committerDan Williams <dan.j.williams@intel.com>2024-01-05 19:03:06 -0800
commit80dda9a69a487c72ded1ac69234c8a89d5922b04 (patch)
tree24130c9b4980f6a171cbed0d154beaf527a9bfa7 /drivers/input/misc
parentd3953c78fc78d37f1b795740632ec7c3d83ef98a (diff)
parentc7ad3dc3649730af483ee1e78be5d0362da25bfe (diff)
Merge branch 'for-6.8/cxl-misc' into for-6.8/cxl
Pick up some miscellaneous fixups for v6.8.
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/soc_button_array.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index 08bcee3d6bcc..f6d060377d18 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -299,6 +299,11 @@ static int soc_button_parse_btn_desc(struct device *dev,
info->name = "power";
info->event_code = KEY_POWER;
info->wakeup = true;
+ } else if (upage == 0x01 && usage == 0xc6) {
+ info->name = "airplane mode switch";
+ info->event_type = EV_SW;
+ info->event_code = SW_RFKILL_ALL;
+ info->active_low = false;
} else if (upage == 0x01 && usage == 0xca) {
info->name = "rotation lock switch";
info->event_type = EV_SW;