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

HID: hid-apple: add device ID of another wireless aluminium

I've recently bought a Apple wireless aluminum keyboard (model 2011) which is
not yet supported by the kernel - it seems they just changed the device id.
After applying the attached patch, the device is fully functional.

Signed-off-by: Andreas Krist <andreas.krist@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Andreas Krist 13 years ago
parent
213f9da805
commit
ad734bc156
3 changed files with 5 additions and 0 deletions
Split View Show Diff Stats
  1. 3 0
      drivers/hid/hid-apple.c
  2. 1 0
      drivers/hid/hid-core.c
  3. 1 0
      drivers/hid/hid-ids.h

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

@@ -458,6 +458,9 @@ static const struct hid_device_id apple_devices[] = {
 
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
 
 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
 
 			APPLE_ISO_KEYBOARD },
 
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),
 
+		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
 
+			APPLE_ISO_KEYBOARD },
 
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
 
 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),

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

@@ -1377,6 +1377,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
 
 	{ 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) },
 
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
 
 	{ 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) },
 
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) },

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

@@ -124,6 +124,7 @@
 
 #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
 
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256
 
 #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a
 
 #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b
 
 #define USB_DEVICE_ID_APPLE_ATV_IRCONTROL	0x8241