Skip to content

Commit 5f86a08

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.4/apple' into for-linus
- quirks for Apple Geyser 3 and Apple Geyser 4 (Alex Henrie)
2 parents cdc780f + 29e1ecc commit 5f86a08

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

‎drivers/hid/hid-apple.c‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <linux/slab.h>
2323
#include <linux/timer.h>
2424
#include <linux/string.h>
25+
#include <linux/leds.h>
2526

2627
#include "hid-ids.h"
2728

@@ -875,14 +876,16 @@ static const struct hid_device_id apple_devices[] = {
875876
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI),
876877
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
877878
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO),
878-
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
879+
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
880+
APPLE_ISO_TILDE_QUIRK },
879881
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS),
880882
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
881883
APPLE_RDESC_JIS },
882884
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI),
883885
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
884886
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO),
885-
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
887+
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
888+
APPLE_ISO_TILDE_QUIRK },
886889
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS),
887890
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
888891
APPLE_RDESC_JIS },
@@ -901,7 +904,8 @@ static const struct hid_device_id apple_devices[] = {
901904
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI),
902905
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
903906
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO),
904-
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
907+
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
908+
APPLE_ISO_TILDE_QUIRK },
905909
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),
906910
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
907911
APPLE_RDESC_JIS },
@@ -942,31 +946,31 @@ static const struct hid_device_id apple_devices[] = {
942946
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
943947
.driver_data = APPLE_HAS_FN },
944948
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
945-
.driver_data = APPLE_HAS_FN },
949+
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
946950
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS),
947951
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
948952
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),
949953
.driver_data = APPLE_HAS_FN },
950954
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),
951-
.driver_data = APPLE_HAS_FN },
955+
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
952956
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),
953957
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
954958
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI),
955959
.driver_data = APPLE_HAS_FN },
956960
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO),
957-
.driver_data = APPLE_HAS_FN },
961+
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
958962
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
959963
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
960964
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI),
961965
.driver_data = APPLE_HAS_FN },
962966
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ISO),
963-
.driver_data = APPLE_HAS_FN },
967+
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
964968
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_JIS),
965969
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
966970
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI),
967971
.driver_data = APPLE_HAS_FN },
968972
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO),
969-
.driver_data = APPLE_HAS_FN },
973+
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
970974
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),
971975
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
972976
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),

0 commit comments

Comments
 (0)