Skip to content

Commit 6058bc8

Browse files
marcanjannau
authored andcommitted
HID: apple: Bind to HOST devices for MTP
We use BUS_HOST for MTP HID subdevices Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent d87f3fb commit 6058bc8

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/hid/hid-apple.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,9 +473,11 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
473473

474474
if (real_fnmode) {
475475
switch (hid->bus) {
476+
case BUS_HOST:
476477
case BUS_SPI:
477478
switch (hid->product) {
478-
case SPI_DEVICE_ID_APPLE_MACBOOK_PRO13_2020:
479+
case SPI_DEVICE_ID_APPLE_MACBOOK_PRO13_2020:
480+
case HOST_DEVICE_ID_APPLE_MACBOOK_PRO13_2022:
479481
table = macbookpro_dedicated_esc_fn_keys;
480482
break;
481483
default:
@@ -950,7 +952,7 @@ static int apple_probe(struct hid_device *hdev,
950952
struct apple_sc *asc;
951953
int ret;
952954

953-
if (id->bus == BUS_SPI && id->vendor == SPI_VENDOR_ID_APPLE &&
955+
if ((id->bus == BUS_SPI || id->bus == BUS_HOST) && id->vendor == SPI_VENDOR_ID_APPLE &&
954956
hdev->type != HID_TYPE_SPI_KEYBOARD)
955957
return -ENODEV;
956958

@@ -1222,6 +1224,8 @@ static const struct hid_device_id apple_devices[] = {
12221224
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
12231225
{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021),
12241226
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
1227+
{ HID_DEVICE(BUS_HOST, HID_GROUP_ANY, HOST_VENDOR_ID_APPLE, HID_ANY_ID),
1228+
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
12251229
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024),
12261230
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
12271231
{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024),

0 commit comments

Comments
 (0)