diff options
-rw-r--r-- | drivers/hid/hid-apple.c | 6 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 3 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index aa28aed0e46c..7ed94cf260d2 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c | |||
@@ -387,6 +387,12 @@ static const struct hid_device_id apple_devices[] = { | |||
387 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS), | 387 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS), |
388 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | | 388 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | |
389 | APPLE_RDESC_JIS }, | 389 | APPLE_RDESC_JIS }, |
390 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ANSI), | ||
391 | .driver_data = APPLE_HAS_FN }, | ||
392 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ISO), | ||
393 | .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, | ||
394 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_JIS), | ||
395 | .driver_data = APPLE_HAS_FN }, | ||
390 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI), | 396 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI), |
391 | .driver_data = APPLE_HAS_FN }, | 397 | .driver_data = APPLE_HAS_FN }, |
392 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO), | 398 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO), |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 646ba221c00b..74bec03ef881 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1236,6 +1236,9 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1236 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) }, | 1236 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) }, |
1237 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) }, | 1237 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) }, |
1238 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) }, | 1238 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) }, |
1239 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ANSI) }, | ||
1240 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ISO) }, | ||
1241 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_JIS) }, | ||
1239 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI) }, | 1242 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI) }, |
1240 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO) }, | 1243 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO) }, |
1241 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS) }, | 1244 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 7270ccc484ab..65b790fd6bfa 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -67,6 +67,9 @@ | |||
67 | #define USB_DEVICE_ID_APPLE_GEYSER4_ANSI 0x021a | 67 | #define USB_DEVICE_ID_APPLE_GEYSER4_ANSI 0x021a |
68 | #define USB_DEVICE_ID_APPLE_GEYSER4_ISO 0x021b | 68 | #define USB_DEVICE_ID_APPLE_GEYSER4_ISO 0x021b |
69 | #define USB_DEVICE_ID_APPLE_GEYSER4_JIS 0x021c | 69 | #define USB_DEVICE_ID_APPLE_GEYSER4_JIS 0x021c |
70 | #define USB_DEVICE_ID_APPLE_ALU_MINI_ANSI 0x021d | ||
71 | #define USB_DEVICE_ID_APPLE_ALU_MINI_ISO 0x021e | ||
72 | #define USB_DEVICE_ID_APPLE_ALU_MINI_JIS 0x021f | ||
70 | #define USB_DEVICE_ID_APPLE_ALU_ANSI 0x0220 | 73 | #define USB_DEVICE_ID_APPLE_ALU_ANSI 0x0220 |
71 | #define USB_DEVICE_ID_APPLE_ALU_ISO 0x0221 | 74 | #define USB_DEVICE_ID_APPLE_ALU_ISO 0x0221 |
72 | #define USB_DEVICE_ID_APPLE_ALU_JIS 0x0222 | 75 | #define USB_DEVICE_ID_APPLE_ALU_JIS 0x0222 |