Skip to content

Commit 3ac35be

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 <[email protected]>
1 parent 485daef commit 3ac35be

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

drivers/hid/hid-apple.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,10 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
498498
else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI &&
499499
hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS)
500500
table = macbookair_fn_keys;
501-
else if (hid->bus == BUS_SPI)
501+
else if (hid->bus == BUS_HOST || hid->bus == BUS_SPI)
502502
switch (hid->product) {
503503
case SPI_DEVICE_ID_APPLE_MACBOOK_PRO13_2020:
504+
case HOST_DEVICE_ID_APPLE_MACBOOK_PRO13_2022:
504505
table = macbookpro_dedicated_esc_fn_keys;
505506
break;
506507
default:
@@ -919,7 +920,7 @@ static int apple_probe(struct hid_device *hdev,
919920
struct apple_sc *asc;
920921
int ret;
921922

922-
if (id->bus == BUS_SPI && id->vendor == SPI_VENDOR_ID_APPLE &&
923+
if ((id->bus == BUS_SPI || id->bus == BUS_HOST) && id->vendor == SPI_VENDOR_ID_APPLE &&
923924
hdev->type != HID_TYPE_SPI_KEYBOARD)
924925
return -ENODEV;
925926

@@ -1184,6 +1185,8 @@ static const struct hid_device_id apple_devices[] = {
11841185
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
11851186
{ HID_SPI_DEVICE(SPI_VENDOR_ID_APPLE, HID_ANY_ID),
11861187
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
1188+
{ HID_DEVICE(BUS_HOST, HID_GROUP_ANY, HOST_VENDOR_ID_APPLE, HID_ANY_ID),
1189+
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
11871190
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT),
11881191
.driver_data = APPLE_MAGIC_BACKLIGHT },
11891192

0 commit comments

Comments
 (0)