| From dfb204f120ad0853073dc7f258725d2e8d565625 Mon Sep 17 00:00:00 2001 |
| From: Mansour Behabadi <mansour@oxplot.com> |
| Date: Wed, 29 Jan 2020 17:26:31 +1100 |
| Subject: [PATCH] HID: apple: Add support for recent firmware on Magic |
| Keyboards |
| |
| commit e433be929e63265b7412478eb7ff271467aee2d7 upstream. |
| |
| Magic Keyboards with more recent firmware (0x0100) report Fn key differently. |
| Without this patch, Fn key may not behave as expected and may not be |
| configurable via hid_apple fnmode module parameter. |
| |
| Signed-off-by: Mansour Behabadi <mansour@oxplot.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c |
| index 6ac8becc2372..d732d1d10caf 100644 |
| --- a/drivers/hid/hid-apple.c |
| +++ b/drivers/hid/hid-apple.c |
| @@ -340,7 +340,8 @@ static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi, |
| unsigned long **bit, int *max) |
| { |
| if (usage->hid == (HID_UP_CUSTOM | 0x0003) || |
| - usage->hid == (HID_UP_MSVENDOR | 0x0003)) { |
| + usage->hid == (HID_UP_MSVENDOR | 0x0003) || |
| + usage->hid == (HID_UP_HPVENDOR2 | 0x0003)) { |
| /* The fn key on Apple USB keyboards */ |
| set_bit(EV_REP, hi->input->evbit); |
| hid_map_usage_clear(hi, usage, bit, max, EV_KEY, KEY_FN); |
| -- |
| 2.7.4 |
| |
