diff options
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0105-Input-xpad-handle-all-variations-of-Mad-Catz-Beat-Pa.patch')
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0105-Input-xpad-handle-all-variations-of-Mad-Catz-Beat-Pa.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0105-Input-xpad-handle-all-variations-of-Mad-Catz-Beat-Pa.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0105-Input-xpad-handle-all-variations-of-Mad-Catz-Beat-Pa.patch new file mode 100644 index 00000000..cf26e8f0 --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0105-Input-xpad-handle-all-variations-of-Mad-Catz-Beat-Pa.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From f8acffc53848df78a3d1683f4ab3f1236a20512d Mon Sep 17 00:00:00 2001 | ||
2 | From: Yuri Khan <yurivkhan@gmail.com> | ||
3 | Date: Wed, 11 Jul 2012 00:49:18 -0700 | ||
4 | Subject: [PATCH 105/109] Input: xpad - handle all variations of Mad Catz Beat | ||
5 | Pad | ||
6 | |||
7 | commit 3ffb62cb9ac2430c2504c6ff9727d0f2476ef0bd upstream. | ||
8 | |||
9 | The device should be handled by xpad driver instead of generic HID driver. | ||
10 | |||
11 | Signed-off-by: Yuri Khan <yurivkhan@gmail.com> | ||
12 | Acked-by: Jiri Kosina <jkosina@suse.cz> | ||
13 | Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> | ||
14 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> | ||
15 | --- | ||
16 | drivers/hid/hid-core.c | 1 + | ||
17 | drivers/hid/hid-ids.h | 3 +++ | ||
18 | drivers/input/joystick/xpad.c | 1 + | ||
19 | 3 files changed, 5 insertions(+), 0 deletions(-) | ||
20 | |||
21 | diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c | ||
22 | index c27b402..cfa053e 100644 | ||
23 | --- a/drivers/hid/hid-core.c | ||
24 | +++ b/drivers/hid/hid-core.c | ||
25 | @@ -1884,6 +1884,7 @@ static const struct hid_device_id hid_ignore_list[] = { | ||
26 | { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) }, | ||
27 | { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) }, | ||
28 | { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) }, | ||
29 | + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) }, | ||
30 | { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) }, | ||
31 | { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, | ||
32 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, | ||
33 | diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h | ||
34 | index fba3fc4..07a91a0 100644 | ||
35 | --- a/drivers/hid/hid-ids.h | ||
36 | +++ b/drivers/hid/hid-ids.h | ||
37 | @@ -491,6 +491,9 @@ | ||
38 | #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006 | ||
39 | #define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007 | ||
40 | |||
41 | +#define USB_VENDOR_ID_MADCATZ 0x0738 | ||
42 | +#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 | ||
43 | + | ||
44 | #define USB_VENDOR_ID_MCC 0x09db | ||
45 | #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 | ||
46 | #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a | ||
47 | diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c | ||
48 | index d728875..a2daf38 100644 | ||
49 | --- a/drivers/input/joystick/xpad.c | ||
50 | +++ b/drivers/input/joystick/xpad.c | ||
51 | @@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = { | ||
52 | XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ | ||
53 | XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ | ||
54 | XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ | ||
55 | + { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ | ||
56 | XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ | ||
57 | XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ | ||
58 | XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ | ||
59 | -- | ||
60 | 1.7.7.6 | ||
61 | |||