From 856c7fe3515cae4195b7417ff253c88c84c68196 Mon Sep 17 00:00:00 2001 From: Aditya Garg <85610623+AdityaGarg8@users.noreply.github.com> Date: Tue, 24 May 2022 18:03:47 +0530 Subject: [PATCH] 5.18 --- ...pport-for-keyboard-backlight-on-cert.patch | 197 ------------------ ...-bcm5974-Add-support-for-the-T2-Macs.patch | 0 ...cessary-IDs-and-configuration-for-T2.patch | 100 --------- ...-mapping-for-MacBook-Pros-with-Touch.patch | 103 --------- ...dd-support-for-Apple-T2-attached-iSi.patch | 38 ---- 5 files changed, 438 deletions(-) delete mode 100644 4001-HID-apple-Add-support-for-keyboard-backlight-on-cert.patch rename 4004-Input-bcm5974-Add-support-for-the-T2-Macs.patch => 4001-Input-bcm5974-Add-support-for-the-T2-Macs.patch (100%) delete mode 100644 4002-HID-apple-Add-necessary-IDs-and-configuration-for-T2.patch delete mode 100644 4003-HID-apple-Add-fn-mapping-for-MacBook-Pros-with-Touch.patch delete mode 100644 6001-media-uvcvideo-Add-support-for-Apple-T2-attached-iSi.patch diff --git a/4001-HID-apple-Add-support-for-keyboard-backlight-on-cert.patch b/4001-HID-apple-Add-support-for-keyboard-backlight-on-cert.patch deleted file mode 100644 index 64f0aad..0000000 --- a/4001-HID-apple-Add-support-for-keyboard-backlight-on-cert.patch +++ /dev/null @@ -1,197 +0,0 @@ -From 9018eacbe623b2c3535da37035e5f22d3d70b6ce Mon Sep 17 00:00:00 2001 -From: Paul Pawlowski -Date: Thu, 3 Feb 2022 12:21:13 +0000 -Subject: HID: apple: Add support for keyboard backlight on certain T2 Macs. - -This patch introduces the requisite plumbing for supporting keyboard -backlight on T2-attached, USB exposed models. The quirk mechanism was -used to reuse the existing hid-apple driver. - -Signed-off-by: Paul Pawlowski -Signed-off-by: Aun-Ali Zaidi -Signed-off-by: Aditya Garg -Signed-off-by: Jiri Kosina ---- - drivers/hid/hid-apple.c | 124 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 124 insertions(+) - -diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c -index 7dc89dc6b..5c5991741 100644 ---- a/drivers/hid/hid-apple.c -+++ b/drivers/hid/hid-apple.c -@@ -7,6 +7,7 @@ - * Copyright (c) 2005 Michael Haboustak for Concept2, Inc - * Copyright (c) 2006-2007 Jiri Kosina - * Copyright (c) 2008 Jiri Slaby -+ * Copyright (c) 2019 Paul Pawlowski - */ - - /* -@@ -33,6 +34,7 @@ - /* BIT(7) reserved, was: APPLE_IGNORE_HIDINPUT */ - #define APPLE_NUMLOCK_EMULATION BIT(8) - #define APPLE_RDESC_BATTERY BIT(9) -+#define APPLE_BACKLIGHT_CTL BIT(10) - - #define APPLE_FLAG_FKEY 0x01 - -@@ -61,6 +63,12 @@ MODULE_PARM_DESC(swap_fn_leftctrl, "Swap the Fn and left Control keys. " - "(For people who want to keep PC keyboard muscle memory. " - "[0] = as-is, Mac layout, 1 = swapped, PC layout)"); - -+struct apple_sc_backlight { -+ struct led_classdev cdev; -+ struct hid_device *hdev; -+ unsigned short backlight_off, backlight_on_min, backlight_on_max; -+}; -+ - struct apple_sc { - struct hid_device *hdev; - unsigned long quirks; -@@ -68,6 +76,7 @@ struct apple_sc { - unsigned int fn_found; - DECLARE_BITMAP(pressed_numlock, KEY_CNT); - struct timer_list battery_timer; -+ struct apple_sc_backlight *backlight; - }; - - struct apple_key_translation { -@@ -76,6 +85,19 @@ struct apple_key_translation { - u8 flags; - }; - -+struct apple_backlight_config_report { -+ u8 report_id; -+ u8 version; -+ u16 backlight_off, backlight_on_min, backlight_on_max; -+}; -+ -+struct apple_backlight_set_report { -+ u8 report_id; -+ u8 version; -+ u16 backlight; -+ u16 rate; -+}; -+ - static const struct apple_key_translation apple2021_fn_keys[] = { - { KEY_BACKSPACE, KEY_DELETE }, - { KEY_ENTER, KEY_INSERT }, -@@ -530,6 +552,105 @@ static int apple_input_configured(struct hid_device *hdev, - return 0; - } - -+static bool apple_backlight_check_support(struct hid_device *hdev) -+{ -+ int i; -+ unsigned int hid; -+ struct hid_report *report; -+ -+ list_for_each_entry(report, &hdev->report_enum[HID_INPUT_REPORT].report_list, list) { -+ for (i = 0; i < report->maxfield; i++) { -+ hid = report->field[i]->usage->hid; -+ if ((hid & HID_USAGE_PAGE) == HID_UP_MSVENDOR && (hid & HID_USAGE) == 0xf) -+ return true; -+ } -+ } -+ -+ return false; -+} -+ -+static int apple_backlight_set(struct hid_device *hdev, u16 value, u16 rate) -+{ -+ int ret = 0; -+ struct apple_backlight_set_report *rep; -+ -+ rep = kmalloc(sizeof(*rep), GFP_KERNEL); -+ if (rep == NULL) -+ return -ENOMEM; -+ -+ rep->report_id = 0xB0; -+ rep->version = 1; -+ rep->backlight = value; -+ rep->rate = rate; -+ -+ ret = hid_hw_raw_request(hdev, 0xB0u, (u8 *) rep, sizeof(*rep), -+ HID_OUTPUT_REPORT, HID_REQ_SET_REPORT); -+ -+ kfree(rep); -+ return ret; -+} -+ -+static int apple_backlight_led_set(struct led_classdev *led_cdev, -+ enum led_brightness brightness) -+{ -+ struct apple_sc_backlight *backlight = container_of(led_cdev, -+ struct apple_sc_backlight, cdev); -+ -+ return apple_backlight_set(backlight->hdev, brightness, 0); -+} -+ -+static int apple_backlight_init(struct hid_device *hdev) -+{ -+ int ret; -+ struct apple_sc *asc = hid_get_drvdata(hdev); -+ struct apple_backlight_config_report *rep; -+ -+ if (!apple_backlight_check_support(hdev)) -+ return -EINVAL; -+ -+ rep = kmalloc(0x200, GFP_KERNEL); -+ if (rep == NULL) -+ return -ENOMEM; -+ -+ ret = hid_hw_raw_request(hdev, 0xBFu, (u8 *) rep, sizeof(*rep), -+ HID_FEATURE_REPORT, HID_REQ_GET_REPORT); -+ if (ret < 0) { -+ hid_err(hdev, "backlight request failed: %d\n", ret); -+ goto cleanup_and_exit; -+ } -+ if (ret < 8 || rep->version != 1) { -+ hid_err(hdev, "backlight config struct: bad version %i\n", rep->version); -+ ret = -EINVAL; -+ goto cleanup_and_exit; -+ } -+ -+ hid_dbg(hdev, "backlight config: off=%u, on_min=%u, on_max=%u\n", -+ rep->backlight_off, rep->backlight_on_min, rep->backlight_on_max); -+ -+ asc->backlight = devm_kzalloc(&hdev->dev, sizeof(*asc->backlight), GFP_KERNEL); -+ if (!asc->backlight) { -+ ret = -ENOMEM; -+ goto cleanup_and_exit; -+ } -+ -+ asc->backlight->hdev = hdev; -+ asc->backlight->cdev.name = "apple::kbd_backlight"; -+ asc->backlight->cdev.max_brightness = rep->backlight_on_max; -+ asc->backlight->cdev.brightness_set_blocking = apple_backlight_led_set; -+ -+ ret = apple_backlight_set(hdev, 0, 0); -+ if (ret < 0) { -+ hid_err(hdev, "backlight set request failed: %d\n", ret); -+ goto cleanup_and_exit; -+ } -+ -+ ret = devm_led_classdev_register(&hdev->dev, &asc->backlight->cdev); -+ -+cleanup_and_exit: -+ kfree(rep); -+ return ret; -+} -+ - static int apple_probe(struct hid_device *hdev, - const struct hid_device_id *id) - { -@@ -565,6 +686,9 @@ static int apple_probe(struct hid_device *hdev, - jiffies + msecs_to_jiffies(APPLE_BATTERY_TIMEOUT_MS)); - apple_fetch_battery(hdev); - -+ if (quirks & APPLE_BACKLIGHT_CTL) -+ apple_backlight_init(hdev); -+ - return 0; - } - --- -2.25.1 - diff --git a/4004-Input-bcm5974-Add-support-for-the-T2-Macs.patch b/4001-Input-bcm5974-Add-support-for-the-T2-Macs.patch similarity index 100% rename from 4004-Input-bcm5974-Add-support-for-the-T2-Macs.patch rename to 4001-Input-bcm5974-Add-support-for-the-T2-Macs.patch diff --git a/4002-HID-apple-Add-necessary-IDs-and-configuration-for-T2.patch b/4002-HID-apple-Add-necessary-IDs-and-configuration-for-T2.patch deleted file mode 100644 index de53e62..0000000 --- a/4002-HID-apple-Add-necessary-IDs-and-configuration-for-T2.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 6edcf53c9ed03fc033a75269276b640673313407 Mon Sep 17 00:00:00 2001 -From: Aun-Ali Zaidi -Date: Thu, 3 Feb 2022 12:22:09 +0000 -Subject: [PATCH] HID: apple: Add necessary IDs and configuration for T2 Macs. - -This patch adds the necessary IDs and configuration for Macs with -the T2 Security chip. - -Signed-off-by: Aun-Ali Zaidi -Signed-off-by: Aditya Garg -Signed-off-by: Jiri Kosina ---- - drivers/hid/hid-apple.c | 16 ++++++++++++++++ - drivers/hid/hid-ids.h | 8 ++++++++ - drivers/hid/hid-quirks.c | 16 ++++++++++++++++ - 3 files changed, 40 insertions(+) - -diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c -index 5c5991741..e21c64c47 100644 ---- a/drivers/hid/hid-apple.c -+++ b/drivers/hid/hid-apple.c -@@ -860,6 +860,22 @@ static const struct hid_device_id apple_devices[] = { - .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, - { 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 }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132), -+ .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680), -+ .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213), -+ .driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K), -+ .driver_data = APPLE_HAS_FN }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223), -+ .driver_data = APPLE_HAS_FN }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K), -+ .driver_data = APPLE_HAS_FN }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F), -+ .driver_data = APPLE_HAS_FN }, - { 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), -diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 78bd3ddda..6c2a36b16 100644 ---- a/drivers/hid/hid-ids.h -+++ b/drivers/hid/hid-ids.h -@@ -167,6 +167,14 @@ - #define USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI 0x0272 - #define USB_DEVICE_ID_APPLE_WELLSPRING9_ISO 0x0273 - #define USB_DEVICE_ID_APPLE_WELLSPRING9_JIS 0x0274 -+#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K 0x027a -+#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132 0x027b -+#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680 0x027c -+#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213 0x027d -+#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K 0x027e -+#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223 0x027f -+#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K 0x0280 -+#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F 0x0340 - #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a - #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b - #define USB_DEVICE_ID_APPLE_IRCONTROL 0x8240 -diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index c066ba901..dc67717d2 100644 ---- a/drivers/hid/hid-quirks.c -+++ b/drivers/hid/hid-quirks.c -@@ -295,6 +295,14 @@ static const struct hid_device_id hid_have_special_driver[] = { - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ISO) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) }, -@@ -930,6 +938,14 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ISO) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, - { } --- -2.25.1 - diff --git a/4003-HID-apple-Add-fn-mapping-for-MacBook-Pros-with-Touch.patch b/4003-HID-apple-Add-fn-mapping-for-MacBook-Pros-with-Touch.patch deleted file mode 100644 index 041b3f9..0000000 --- a/4003-HID-apple-Add-fn-mapping-for-MacBook-Pros-with-Touch.patch +++ /dev/null @@ -1,103 +0,0 @@ -From c5f09b1b45cbb90147846f82ec0489789c99667e Mon Sep 17 00:00:00 2001 -From: Aditya Garg -Date: Thu, 3 Feb 2022 12:23:02 +0000 -Subject: HID: apple: Add fn mapping for MacBook Pros with Touch Bar - -This patch adds the Fn mapping for keyboards on certain T2 Macs. - -Signed-off-by: Aditya Garg -Signed-off-by: Jiri Kosina ---- - drivers/hid/hid-apple.c | 62 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 62 insertions(+) - -diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c -index e21c64c47..aefab2a75 100644 ---- a/drivers/hid/hid-apple.c -+++ b/drivers/hid/hid-apple.c -@@ -141,6 +141,51 @@ static const struct apple_key_translation macbookair_fn_keys[] = { - { } - }; - -+static const struct apple_key_translation macbookpro_no_esc_fn_keys[] = { -+ { KEY_BACKSPACE, KEY_DELETE }, -+ { KEY_ENTER, KEY_INSERT }, -+ { KEY_GRAVE, KEY_ESC }, -+ { KEY_1, KEY_F1 }, -+ { KEY_2, KEY_F2 }, -+ { KEY_3, KEY_F3 }, -+ { KEY_4, KEY_F4 }, -+ { KEY_5, KEY_F5 }, -+ { KEY_6, KEY_F6 }, -+ { KEY_7, KEY_F7 }, -+ { KEY_8, KEY_F8 }, -+ { KEY_9, KEY_F9 }, -+ { KEY_0, KEY_F10 }, -+ { KEY_MINUS, KEY_F11 }, -+ { KEY_EQUAL, KEY_F12 }, -+ { KEY_UP, KEY_PAGEUP }, -+ { KEY_DOWN, KEY_PAGEDOWN }, -+ { KEY_LEFT, KEY_HOME }, -+ { KEY_RIGHT, KEY_END }, -+ { } -+}; -+ -+static const struct apple_key_translation macbookpro_dedicated_esc_fn_keys[] = { -+ { KEY_BACKSPACE, KEY_DELETE }, -+ { KEY_ENTER, KEY_INSERT }, -+ { KEY_1, KEY_F1 }, -+ { KEY_2, KEY_F2 }, -+ { KEY_3, KEY_F3 }, -+ { KEY_4, KEY_F4 }, -+ { KEY_5, KEY_F5 }, -+ { KEY_6, KEY_F6 }, -+ { KEY_7, KEY_F7 }, -+ { KEY_8, KEY_F8 }, -+ { KEY_9, KEY_F9 }, -+ { KEY_0, KEY_F10 }, -+ { KEY_MINUS, KEY_F11 }, -+ { KEY_EQUAL, KEY_F12 }, -+ { KEY_UP, KEY_PAGEUP }, -+ { KEY_DOWN, KEY_PAGEDOWN }, -+ { KEY_LEFT, KEY_HOME }, -+ { KEY_RIGHT, KEY_END }, -+ { } -+}; -+ - static const struct apple_key_translation apple_fn_keys[] = { - { KEY_BACKSPACE, KEY_DELETE }, - { KEY_ENTER, KEY_INSERT }, -@@ -268,6 +313,17 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, - hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 || - hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021) - table = apple2021_fn_keys; -+ else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132 || -+ hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680 || -+ hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213) -+ table = macbookpro_no_esc_fn_keys; -+ else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K || -+ hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223 || -+ hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F) -+ table = macbookpro_dedicated_esc_fn_keys; -+ else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K || -+ hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K) -+ table = apple_fn_keys; - else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI && - hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) - table = macbookair_fn_keys; -@@ -479,6 +535,12 @@ static void apple_setup_input(struct input_dev *input) - set_bit(KEY_NUMLOCK, input->keybit); - - /* Enable all needed keys */ -+ for (trans = macbookpro_no_esc_fn_keys; trans->from; trans++) -+ set_bit(trans->to, input->keybit); -+ -+ for (trans = macbookpro_dedicated_esc_fn_keys; trans->from; trans++) -+ set_bit(trans->to, input->keybit); -+ - for (trans = apple_fn_keys; trans->from; trans++) - set_bit(trans->to, input->keybit); - --- -2.25.1 - diff --git a/6001-media-uvcvideo-Add-support-for-Apple-T2-attached-iSi.patch b/6001-media-uvcvideo-Add-support-for-Apple-T2-attached-iSi.patch deleted file mode 100644 index 763847e..0000000 --- a/6001-media-uvcvideo-Add-support-for-Apple-T2-attached-iSi.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b6740001d1adbfe84768b859bee038ceeccdc50c Mon Sep 17 00:00:00 2001 -From: Paul Pawlowski -Date: Thu, 13 Jan 2022 00:13:01 +1100 -Subject: [PATCH] media: uvcvideo: Add support for Apple T2-attached FaceTime HD Camera - -Adds the requisite device id to support detection of the Apple FaceTime -HD webcam exposed over the T2 BCE VHCI interface. - -Tested-by: Aun-Ali Zaidi -Signed-off-by: Paul Pawlowski -Signed-off-by: Aun-Ali Zaidi -Signed-off-by: Aditya Garg ---- - drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index 7c007426e..88dc9e7aa 100644 ---- a/drivers/media/usb/uvc/uvc_driver.c -+++ b/drivers/media/usb/uvc/uvc_driver.c -@@ -2848,6 +2848,15 @@ static const struct usb_device_id uvc_ids[] = { - .bInterfaceProtocol = 0, - .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_PROBE_MINMAX - | UVC_QUIRK_BUILTIN_ISIGHT) }, -+ /* Apple FaceTime HD Camera (Built-In) */ -+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE -+ | USB_DEVICE_ID_MATCH_INT_INFO, -+ .idVendor = 0x05ac, -+ .idProduct = 0x8514, -+ .bInterfaceClass = USB_CLASS_VIDEO, -+ .bInterfaceSubClass = 1, -+ .bInterfaceProtocol = 0, -+ .driver_info = (kernel_ulong_t)&uvc_quirk_probe_def }, - /* Apple Built-In iSight via iBridge */ - { .match_flags = USB_DEVICE_ID_MATCH_DEVICE - | USB_DEVICE_ID_MATCH_INT_INFO, --- -2.25.1