Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

HID: Add device IDs for Macbook Pro 8 keyboards

This patch adds keyboard support for Macbook Pro 8 models which has
WELLSPRING5A model name and 0x0252, 0x0253 and 0x0254 USB IDs. Trackpad
support for those models are added to bcm5974 in
c331eb580a0a7906c0cdb8dbae3cfe99e3c0e555 ("Input: bcm5974 - Add
support for newer MacBookPro8,2).

Signed-off-by: Gökçen Eraslan <gokcen@pardus.org.tr>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Gökçen Eraslan 13 years ago
parent
31dced41c6
commit
213f9da805
3 changed files with 15 additions and 0 deletions
Split View Show Diff Stats
  1. 6 0
      drivers/hid/hid-apple.c
  2. 6 0
      drivers/hid/hid-core.c
  3. 3 0
      drivers/hid/hid-ids.h

+ 6 - 0
drivers/hid/hid-apple.c
View File 

@@ -508,6 +508,12 @@ static const struct hid_device_id apple_devices[] = {
 
 		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS),
 
 		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI),
 
+		.driver_data = APPLE_HAS_FN },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO),
 
+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS),
 
+		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
 
 	{ 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),

+ 6 - 0
drivers/hid/hid-core.c
View File 

@@ -1362,6 +1362,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS) },
 
@@ -1942,6 +1945,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = {
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) },

+ 3 - 0
drivers/hid/hid-ids.h
View File 

@@ -112,6 +112,9 @@
 
 #define USB_DEVICE_ID_APPLE_ALU_REVB_ANSI	0x024f
 
 #define USB_DEVICE_ID_APPLE_ALU_REVB_ISO	0x0250
 
 #define USB_DEVICE_ID_APPLE_ALU_REVB_JIS	0x0251
 
+#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI	0x0252
 
+#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO	0x0253
 
+#define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS	0x0254
 
 #define USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI	0x0249
 
 #define USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO	0x024a
 
 #define USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS	0x024b