-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
83209fd
commit 1b63b1a
Showing
2 changed files
with
51 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c | ||
index 1cb41992a..58197f729 100644 | ||
--- a/drivers/hid/hid-apple.c | ||
+++ b/drivers/hid/hid-apple.c | ||
@@ -557,6 +557,10 @@ static const struct hid_device_id apple_devices[] = { | ||
.driver_data = APPLE_HAS_FN }, | ||
{ 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_MBA8_1), | ||
+ .driver_data = APPLE_HAS_FN }, | ||
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MBP15_X), | ||
+ .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 adce58f24..1ee41d05c 100644 | ||
--- a/drivers/hid/hid-ids.h | ||
+++ b/drivers/hid/hid-ids.h | ||
@@ -170,6 +170,8 @@ | ||
#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_MBA8_1 0x027a | ||
+#define USB_DEVICE_ID_APPLE_MBP15_X 0x027b | ||
#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 77ffba48c..3853d11d3 100644 | ||
--- a/drivers/hid/hid-quirks.c | ||
+++ b/drivers/hid/hid-quirks.c | ||
@@ -269,6 +269,8 @@ 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_MBA8_1) }, | ||
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MBP15_X) }, | ||
{ 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) }, | ||
@@ -916,6 +918,8 @@ 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_MBA8_1) }, | ||
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MBP15_X) }, | ||
{ 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) }, | ||
{ } |