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 support for new revision of Apple aluminum keyboard

Add USB device ids for the new revision (MB110LL/B) of Apple's wired aluminum
keyboard.  I have only confirmed that the ANSI version is correct - it is
assumed that the ISO and JIS versions follow the standard numbering convention.

Signed-off-by: Dan Bastone <dan@pwienterprises.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Dan Bastone 14 years ago
parent
f5fc87905e
commit
4a4c879904
3 changed files with 12 additions and 0 deletions
Split View Show Diff Stats
  1. 6 0
      drivers/hid/hid-apple.c
  2. 3 0
      drivers/hid/hid-core.c
  3. 3 0
      drivers/hid/hid-ids.h

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

@@ -444,6 +444,12 @@ static const struct hid_device_id apple_devices[] = {
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),
 
 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
 
 			APPLE_RDESC_JIS },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI),
 
+		.driver_data = APPLE_HAS_FN },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO),
 
+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
 
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS),
 
+		.driver_data = APPLE_HAS_FN },
 
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
 
 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
 
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),

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

@@ -1340,6 +1340,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_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) },
 
 	{ 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) },

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

@@ -109,6 +109,9 @@
 
 #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI	0x0245
 
 #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO	0x0246
 
 #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS	0x0247
 
+#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_ALU_WIRELESS_2009_ANSI  0x0239
 
 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a
 
 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b