Skip to content

Commit 37a9153

Browse files
jannaumarcan
authored andcommitted
HID: add device IDs for Apple SPI HID devices
Apple Silicon based laptop use SPI as transport for HID. Add support for SPI-based HID devices and and Apple keyboard and trackpad devices. Intel based laptops using the keyboard input driver applespi use the same HID over SPI protocol and can be supported later. This requires SPI keyboard/mouse HID types since Apple's intenal keyboards/trackpads use the same product id. Signed-off-by: Janne Grunau <[email protected]>
1 parent 457391b commit 37a9153

3 files changed

Lines changed: 13 additions & 1 deletion

File tree

drivers/hid/hid-core.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2242,6 +2242,9 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
22422242
case BUS_I2C:
22432243
bus = "I2C";
22442244
break;
2245+
case BUS_SPI:
2246+
bus = "SPI";
2247+
break;
22452248
case BUS_VIRTUAL:
22462249
bus = "VIRTUAL";
22472250
break;

drivers/hid/hid-ids.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989

9090
#define USB_VENDOR_ID_APPLE 0x05ac
9191
#define BT_VENDOR_ID_APPLE 0x004c
92+
#define SPI_VENDOR_ID_APPLE 0x05ac
9293
#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
9394
#define USB_DEVICE_ID_APPLE_MAGICMOUSE 0x030d
9495
#define USB_DEVICE_ID_APPLE_MAGICMOUSE2 0x0269
@@ -187,6 +188,10 @@
187188
#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021 0x029f
188189
#define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102
189190
#define USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY 0x8302
191+
#define SPI_DEVICE_ID_APPLE_MACBOOK_AIR_2020 0x0281
192+
#define SPI_DEVICE_ID_APPLE_MACBOOK_PRO13_2020 0x0341
193+
#define SPI_DEVICE_ID_APPLE_MACBOOK_PRO14_2021 0x0342
194+
#define SPI_DEVICE_ID_APPLE_MACBOOK_PRO16_2021 0x0343
190195

191196
#define USB_VENDOR_ID_ASUS 0x0486
192197
#define USB_DEVICE_ID_ASUS_T91MT 0x0185

include/linux/hid.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,9 @@ struct hid_input {
562562
enum hid_type {
563563
HID_TYPE_OTHER = 0,
564564
HID_TYPE_USBMOUSE,
565-
HID_TYPE_USBNONE
565+
HID_TYPE_USBNONE,
566+
HID_TYPE_SPI_KEYBOARD,
567+
HID_TYPE_SPI_MOUSE,
566568
};
567569

568570
enum hid_battery_status {
@@ -716,6 +718,8 @@ struct hid_descriptor {
716718
.bus = BUS_BLUETOOTH, .vendor = (ven), .product = (prod)
717719
#define HID_I2C_DEVICE(ven, prod) \
718720
.bus = BUS_I2C, .vendor = (ven), .product = (prod)
721+
#define HID_SPI_DEVICE(ven, prod) \
722+
.bus = BUS_SPI, .vendor = (ven), .product = (prod)
719723

720724
#define HID_REPORT_ID(rep) \
721725
.report_type = (rep)

0 commit comments

Comments
 (0)