From 18d3466c7c6eba76743e65418847357f16e11a23 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Sun, 25 Sep 2022 10:55:14 +0530 Subject: [PATCH] Update 4002 and 4003 --- ...y-translations-where-multiple-quirks.patch | 22 ++++++++++++++----- ...-APPLE_ISO_TILDE_QUIRK-for-the-keybo.patch | 10 ++++----- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/4002-HID-apple-fix-key-translations-where-multiple-quirks.patch b/4002-HID-apple-fix-key-translations-where-multiple-quirks.patch index 2bbee94..5cada83 100644 --- a/4002-HID-apple-fix-key-translations-where-multiple-quirks.patch +++ b/4002-HID-apple-fix-key-translations-where-multiple-quirks.patch @@ -1,7 +1,7 @@ -From c0cc70b325708106c6145ca68591d3131b64bfbe Mon Sep 17 00:00:00 2001 +From 07a714fc9a7ac7d9313816c365a8c2fd7ee9cb81 Mon Sep 17 00:00:00 2001 From: Kerem Karabay -Date: Sat, 10 Sep 2022 10:44:39 +0300 -Subject: [PATCH 1/2] HID: apple: fix key translations where multiple quirks +Date: Sat, 24 Sep 2022 11:45:51 +0300 +Subject: [PATCH v2 1/2] HID: apple: fix key translations where multiple quirks attempt to translate the same key and the ones that depend on other translations @@ -63,11 +63,11 @@ dedicated escape key and a non-English layout. Signed-off-by: Kerem Karabay --- - drivers/hid/hid-apple.c | 99 ++++++++++++++++++----------------------- - 1 file changed, 44 insertions(+), 55 deletions(-) + drivers/hid/hid-apple.c | 102 +++++++++++++++++----------------------- + 1 file changed, 44 insertions(+), 58 deletions(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c -index 6970797cdc56..066e8a85daa5 100644 +index 6970797cdc56..e86bbf85b87e 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -314,6 +314,7 @@ static const struct apple_key_translation swapped_option_cmd_keys[] = { @@ -225,6 +225,16 @@ index 6970797cdc56..066e8a85daa5 100644 } return 0; +@@ -640,9 +629,6 @@ static void apple_setup_input(struct input_dev *input) + apple_setup_key_translation(input, apple2021_fn_keys); + apple_setup_key_translation(input, macbookpro_no_esc_fn_keys); + apple_setup_key_translation(input, macbookpro_dedicated_esc_fn_keys); +- +- if (swap_fn_leftctrl) +- apple_setup_key_translation(input, swapped_fn_leftctrl_keys); + } + + static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi, -- 2.37.2 diff --git a/4003-HID-apple-enable-APPLE_ISO_TILDE_QUIRK-for-the-keybo.patch b/4003-HID-apple-enable-APPLE_ISO_TILDE_QUIRK-for-the-keybo.patch index 4ae85fa..d1134a8 100644 --- a/4003-HID-apple-enable-APPLE_ISO_TILDE_QUIRK-for-the-keybo.patch +++ b/4003-HID-apple-enable-APPLE_ISO_TILDE_QUIRK-for-the-keybo.patch @@ -1,7 +1,7 @@ -From 4c653710ac8054c8e9691ebc9cf302d584b2b542 Mon Sep 17 00:00:00 2001 +From 2680cfe2fd7e3f829c2d82cda38d04a9d269ea7f Mon Sep 17 00:00:00 2001 From: Kerem Karabay -Date: Sat, 10 Sep 2022 10:44:40 +0300 -Subject: [PATCH 2/2] HID: apple: enable APPLE_ISO_TILDE_QUIRK for the +Date: Sat, 24 Sep 2022 11:45:53 +0300 +Subject: [PATCH v2 2/2] HID: apple: enable APPLE_ISO_TILDE_QUIRK for the keyboards of Macs with the T2 chip The iso_layout parameter must be manually set to get the driver to @@ -19,10 +19,10 @@ Signed-off-by: Kerem Karabay 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c -index 066e8a85daa5..df994baf547d 100644 +index e86bbf85b87e..c671ce94671c 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c -@@ -1000,21 +1000,21 @@ static const struct hid_device_id apple_devices[] = { +@@ -997,21 +997,21 @@ static const struct hid_device_id apple_devices[] = { { 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),