2022-09-25 10:55:14 +05:30
|
|
|
From 2680cfe2fd7e3f829c2d82cda38d04a9d269ea7f Mon Sep 17 00:00:00 2001
|
2022-09-13 21:20:13 +05:30
|
|
|
From: Kerem Karabay <kekrby@gmail.com>
|
2022-09-25 10:55:14 +05:30
|
|
|
Date: Sat, 24 Sep 2022 11:45:53 +0300
|
|
|
|
|
Subject: [PATCH v2 2/2] HID: apple: enable APPLE_ISO_TILDE_QUIRK for the
|
2022-09-13 21:20:13 +05:30
|
|
|
keyboards of Macs with the T2 chip
|
|
|
|
|
|
|
|
|
|
The iso_layout parameter must be manually set to get the driver to
|
|
|
|
|
swap KEY_102ND and KEY_GRAVE. This patch eliminates the need to do that.
|
|
|
|
|
|
|
|
|
|
This is safe to do, as Macs with keyboards that do not need the quirk
|
|
|
|
|
will keep working the same way as the value of hid->country will be
|
|
|
|
|
different than HID_COUNTRY_INTERNATIONAL_ISO. This was tested by one
|
|
|
|
|
person with a Mac with the WELLSPRINGT2_J152F keyboard with a layout
|
|
|
|
|
that does not require the quirk to be set.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Kerem Karabay <kekrby@gmail.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/hid/hid-apple.c | 16 ++++++++--------
|
|
|
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
|
2022-09-25 10:55:14 +05:30
|
|
|
index e86bbf85b87e..c671ce94671c 100644
|
2022-09-13 21:20:13 +05:30
|
|
|
--- a/drivers/hid/hid-apple.c
|
|
|
|
|
+++ b/drivers/hid/hid-apple.c
|
2022-09-25 10:55:14 +05:30
|
|
|
@@ -997,21 +997,21 @@ static const struct hid_device_id apple_devices[] = {
|
2022-09-13 21:20:13 +05:30
|
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS),
|
|
|
|
|
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
|
|
|
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K),
|
|
|
|
|
- .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL },
|
|
|
|
|
+ .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL | APPLE_ISO_TILDE_QUIRK },
|
|
|
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132),
|
|
|
|
|
- .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL },
|
|
|
|
|
+ .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL | APPLE_ISO_TILDE_QUIRK },
|
|
|
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680),
|
|
|
|
|
- .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL },
|
|
|
|
|
+ .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL | APPLE_ISO_TILDE_QUIRK },
|
|
|
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213),
|
|
|
|
|
- .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL },
|
|
|
|
|
+ .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL | APPLE_ISO_TILDE_QUIRK },
|
|
|
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K),
|
|
|
|
|
- .driver_data = APPLE_HAS_FN },
|
|
|
|
|
+ .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
|
|
|
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223),
|
|
|
|
|
- .driver_data = APPLE_HAS_FN },
|
|
|
|
|
+ .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
|
|
|
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K),
|
|
|
|
|
- .driver_data = APPLE_HAS_FN },
|
|
|
|
|
+ .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
|
|
|
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F),
|
|
|
|
|
- .driver_data = APPLE_HAS_FN },
|
|
|
|
|
+ .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
|
|
|
|
|
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
|
|
|
|
|
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
|
|
|
|
|
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
|
|
|
|
|
--
|
|
|
|
|
2.37.2
|
|
|
|
|
|
