target/linux/brcm2708/patches-4.4/0560-Revert-HID-dragonrise-fix-HID-Descriptor-for-0x0006-.patch

   1 From e7b5643bfddd3ce80f4ade03a980da6b8979136d Mon Sep 17 00:00:00 2001
   2 From: Ioan-Adrian Ratiu <adi@adirat.com>
   3 Date: Tue, 27 Sep 2016 21:41:37 +0300
   4 Subject: [PATCH] Revert "HID: dragonrise: fix HID Descriptor for 0x0006 PID"
   5
   6 [ Upstream commit 1bcaa05ebee115213e34f1806cc6a4f7a6175a88 ]
   7 This reverts commit 18339f59c3a6 ("HID: dragonrise: fix HID...") because it
   8 breaks certain dragonrise 0079:0006 gamepads. While it may fix a breakage
   9 caused by commit 79346d620e9d ("HID: input: force generic axis to be mapped
  10 to their user space axis"), it is probable that the manufacturer released
  11 different hardware with the same PID so this fix works for only a subset
  12 and breaks the other gamepads sharing the PID.
  13
  14 What is needed is another more generic solution which fixes 79346d620e9d
  15 ("HID: input: force generic axis ...") breakage for this controller: we
  16 need to add an exception for this driver to make it keep the old behaviour
  17 previous to the initial breakage (this is done in patch 2 of this series).
  18
  19 Signed-off-by: Ioan-Adrian Ratiu <adi@adirat.com>
  20 Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
  21 Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  22 ---
  23  drivers/hid/hid-dr.c | 58 ----------------------------------------------------
  24  1 file changed, 58 deletions(-)
  25
  26 --- a/drivers/hid/hid-dr.c
  27 +++ b/drivers/hid/hid-dr.c
  28 @@ -234,58 +234,6 @@ static __u8 pid0011_rdesc_fixed[] = {
  29         0xC0                /*  End Collection                  */
  30  };
  31
  32 -static __u8 pid0006_rdesc_fixed[] = {
  33 -       0x05, 0x01,        /* Usage Page (Generic Desktop)      */
  34 -       0x09, 0x04,        /* Usage (Joystick)                  */
  35 -       0xA1, 0x01,        /* Collection (Application)          */
  36 -       0xA1, 0x02,        /*   Collection (Logical)            */
  37 -       0x75, 0x08,        /*     Report Size (8)               */
  38 -       0x95, 0x05,        /*     Report Count (5)              */
  39 -       0x15, 0x00,        /*     Logical Minimum (0)           */
  40 -       0x26, 0xFF, 0x00,  /*     Logical Maximum (255)         */
  41 -       0x35, 0x00,        /*     Physical Minimum (0)          */
  42 -       0x46, 0xFF, 0x00,  /*     Physical Maximum (255)        */
  43 -       0x09, 0x30,        /*     Usage (X)                     */
  44 -       0x09, 0x33,        /*     Usage (Ry)                    */
  45 -       0x09, 0x32,        /*     Usage (Z)                     */
  46 -       0x09, 0x31,        /*     Usage (Y)                     */
  47 -       0x09, 0x34,        /*     Usage (Ry)                    */
  48 -       0x81, 0x02,        /*     Input (Variable)              */
  49 -       0x75, 0x04,        /*     Report Size (4)               */
  50 -       0x95, 0x01,        /*     Report Count (1)              */
  51 -       0x25, 0x07,        /*     Logical Maximum (7)           */
  52 -       0x46, 0x3B, 0x01,  /*     Physical Maximum (315)        */
  53 -       0x65, 0x14,        /*     Unit (Centimeter)             */
  54 -       0x09, 0x39,        /*     Usage (Hat switch)            */
  55 -       0x81, 0x42,        /*     Input (Variable)              */
  56 -       0x65, 0x00,        /*     Unit (None)                   */
  57 -       0x75, 0x01,        /*     Report Size (1)               */
  58 -       0x95, 0x0C,        /*     Report Count (12)             */
  59 -       0x25, 0x01,        /*     Logical Maximum (1)           */
  60 -       0x45, 0x01,        /*     Physical Maximum (1)          */
  61 -       0x05, 0x09,        /*     Usage Page (Button)           */
  62 -       0x19, 0x01,        /*     Usage Minimum (0x01)          */
  63 -       0x29, 0x0C,        /*     Usage Maximum (0x0C)          */
  64 -       0x81, 0x02,        /*     Input (Variable)              */
  65 -       0x06, 0x00, 0xFF,  /*     Usage Page (Vendor Defined)   */
  66 -       0x75, 0x01,        /*     Report Size (1)               */
  67 -       0x95, 0x08,        /*     Report Count (8)              */
  68 -       0x25, 0x01,        /*     Logical Maximum (1)           */
  69 -       0x45, 0x01,        /*     Physical Maximum (1)          */
  70 -       0x09, 0x01,        /*     Usage (0x01)                  */
  71 -       0x81, 0x02,        /*     Input (Variable)              */
  72 -       0xC0,              /*   End Collection                  */
  73 -       0xA1, 0x02,        /*   Collection (Logical)            */
  74 -       0x75, 0x08,        /*     Report Size (8)               */
  75 -       0x95, 0x07,        /*     Report Count (7)              */
  76 -       0x46, 0xFF, 0x00,  /*     Physical Maximum (255)        */
  77 -       0x26, 0xFF, 0x00,  /*     Logical Maximum (255)         */
  78 -       0x09, 0x02,        /*     Usage (0x02)                  */
  79 -       0x91, 0x02,        /*     Output (Variable)             */
  80 -       0xC0,              /*   End Collection                  */
  81 -       0xC0               /* End Collection                    */
  82 -};
  83 -
  84  static __u8 *dr_report_fixup(struct hid_device *hdev, __u8 *rdesc,
  85                                 unsigned int *rsize)
  86  {
  87 @@ -296,12 +244,6 @@ static __u8 *dr_report_fixup(struct hid_
  88                         *rsize = sizeof(pid0011_rdesc_fixed);
  89                 }
  90                 break;
  91 -       case 0x0006:
  92 -               if (*rsize == sizeof(pid0006_rdesc_fixed)) {
  93 -                       rdesc = pid0006_rdesc_fixed;
  94 -                       *rsize = sizeof(pid0006_rdesc_fixed);
  95 -               }
  96 -               break;
  97         }
  98         return rdesc;
  99  }