Skip to content

Commit c0cd2d1

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 e30bfdb commit c0cd2d1

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
@@ -474,9 +474,11 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
474474

475475
if (real_fnmode) {
476476
switch (hid->bus) {
477+
case BUS_HOST:
477478
case BUS_SPI:
478479
switch (hid->product) {
479-
case SPI_DEVICE_ID_APPLE_MACBOOK_PRO13_2020:
480+
case SPI_DEVICE_ID_APPLE_MACBOOK_PRO13_2020:
481+
case HOST_DEVICE_ID_APPLE_MACBOOK_PRO13_2022:
480482
table = macbookpro_dedicated_esc_fn_keys;
481483
break;
482484
default:
@@ -951,7 +953,7 @@ static int apple_probe(struct hid_device *hdev,
951953
struct apple_sc *asc;
952954
int ret;
953955

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

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

0 commit comments

Comments
 (0)