Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull input layer fixes from Dmitry Torokhov:
"The changes are limited to adding new VID/PID combinations to drivers
to enable support for new versions of hardware, most notably hardware
found in new MacBook Pro Retina boxes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: xpad - add Andamiro Pump It Up pad
Input: xpad - add signature for Razer Onza Tournament Edition
Input: xpad - handle all variations of Mad Catz Beat Pad
Input: bcm5974 - Add support for 2012 MacBook Pro Retina
HID: add support for 2012 MacBook Pro Retina

Linus Torvalds 13 years ago 39ea32ca 8488e408

+44 -1

5 changed files

expand all

drivers

hid

hid-apple.c

hid-core.c

hid-ids.h

input

joystick

xpad.c

mouse

bcm5974.c

drivers/hid/hid-apple.c

··· 517 517 .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, 518 518 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS), 519 519 .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, 520 + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI), 521 + .driver_data = APPLE_HAS_FN }, 522 + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO), 523 + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, 524 + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_JIS), 525 + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, 520 526 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI), 521 527 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, 522 528 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),

drivers/hid/hid-core.c

··· 1503 1503 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) }, 1504 1504 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) }, 1505 1505 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) }, 1506 + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI) }, 1507 + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO) }, 1508 + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_JIS) }, 1506 1509 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) }, 1507 1510 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) }, 1508 1511 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) }, ··· 1998 1995 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) }, 1999 1996 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) }, 2000 1997 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) }, 1998 + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) }, 2001 1999 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) }, 2002 2000 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, 2003 2001 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, ··· 2093 2089 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) }, 2094 2090 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) }, 2095 2091 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) }, 2092 + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI) }, 2093 + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO) }, 2094 + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_JIS) }, 2096 2095 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, 2097 2096 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, 2098 2097 { }

drivers/hid/hid-ids.h

··· 125 125 #define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI 0x024c 126 126 #define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO 0x024d 127 127 #define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS 0x024e 128 + #define USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI 0x0262 129 + #define USB_DEVICE_ID_APPLE_WELLSPRING7_ISO 0x0263 130 + #define USB_DEVICE_ID_APPLE_WELLSPRING7_JIS 0x0264 128 131 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239 129 132 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a 130 133 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b ··· 520 517 #define USB_VENDOR_ID_LUMIO 0x202e 521 518 #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006 522 519 #define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007 520 + 521 + #define USB_VENDOR_ID_MADCATZ 0x0738 522 + #define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 523 523 524 524 #define USB_VENDOR_ID_MCC 0x09db 525 525 #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076

+5 -1

drivers/input/joystick/xpad.c

··· 142 142 { 0x0c12, 0x880a, "Pelican Eclipse PL-2023", 0, XTYPE_XBOX }, 143 143 { 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX }, 144 144 { 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX }, 145 + { 0x0d2f, 0x0002, "Andamiro Pump It Up pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, 145 146 { 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX }, 146 147 { 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX }, 147 148 { 0x0e6f, 0x0003, "Logic3 Freebird wireless Controller", 0, XTYPE_XBOX }, ··· 165 164 { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, 166 165 { 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, 167 166 { 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, 167 + { 0x1689, 0xfd00, "Razer Onza Tournament Edition", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, 168 168 { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX }, 169 169 { 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN } 170 170 }; ··· 240 238 XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ 241 239 XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ 242 240 XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ 241 + { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ 243 242 XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ 244 243 XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ 245 244 XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ 246 245 XPAD_XBOX360_VENDOR(0x146b), /* BigBen Interactive Controllers */ 247 246 XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ 248 - XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ 247 + XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ 248 + XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ 249 249 { } 250 250 }; 251 251

+20

drivers/input/mouse/bcm5974.c

··· 79 79 #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI 0x0252 80 80 #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO 0x0253 81 81 #define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS 0x0254 82 + /* MacbookPro10,1 (unibody, June 2012) */ 83 + #define USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI 0x0262 84 + #define USB_DEVICE_ID_APPLE_WELLSPRING7_ISO 0x0263 85 + #define USB_DEVICE_ID_APPLE_WELLSPRING7_JIS 0x0264 82 86 83 87 #define BCM5974_DEVICE(prod) { \ 84 88 .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ ··· 132 128 BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI), 133 129 BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO), 134 130 BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS), 131 + /* MacbookPro10,1 */ 132 + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI), 133 + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ISO), 134 + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_JIS), 135 135 /* Terminating entry */ 136 136 {} 137 137 }; ··· 361 353 { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, 362 354 { DIM_X, DIM_X / SN_COORD, -4620, 5140 }, 363 355 { DIM_Y, DIM_Y / SN_COORD, -150, 6600 } 356 + }, 357 + { 358 + USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI, 359 + USB_DEVICE_ID_APPLE_WELLSPRING7_ISO, 360 + USB_DEVICE_ID_APPLE_WELLSPRING7_JIS, 361 + HAS_INTEGRATED_BUTTON, 362 + 0x84, sizeof(struct bt_data), 363 + 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS, 364 + { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 }, 365 + { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, 366 + { DIM_X, DIM_X / SN_COORD, -4750, 5280 }, 367 + { DIM_Y, DIM_Y / SN_COORD, -150, 6730 } 364 368 }, 365 369 {} 366 370 };