]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:05:09 +0000 (19:05 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:05:09 +0000 (19:05 +0200)
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-sony.c
drivers/hid/i2c-hid/i2c-hid.c

1  2 
drivers/hid/hid-core.c
drivers/hid/hid-hyperv.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-sony.c
drivers/hid/hidraw.c
drivers/hid/i2c-hid/i2c-hid.c
net/bluetooth/hidp/core.c

diff --combined drivers/hid/hid-core.c
index f36b3524caf1a498620e18381316dc9e15a0f36e,ddb981db08bdd14dc4e6f1db34a8ed77bb0de95f..3736f6a121b71824933fd1605c65d6dcada50a91
@@@ -1248,6 -1248,11 +1248,11 @@@ void hid_output_report(struct hid_repor
  }
  EXPORT_SYMBOL_GPL(hid_output_report);
  
+ static int hid_report_len(struct hid_report *report)
+ {
+       return ((report->size - 1) >> 3) + 1 + (report->id > 0) + 7;
+ }
  /*
   * Allocator for buffer that is going to be passed to hid_output_report()
   */
@@@ -1258,7 -1263,7 +1263,7 @@@ u8 *hid_alloc_report_buf(struct hid_rep
         * of implement() working on 8 byte chunks
         */
  
-       int len = ((report->size - 1) >> 3) + 1 + (report->id > 0) + 7;
+       int len = hid_report_len(report);
  
        return kmalloc(len, flags);
  }
@@@ -1314,6 -1319,41 +1319,41 @@@ static struct hid_report *hid_get_repor
        return report;
  }
  
+ /*
+  * Implement a generic .request() callback, using .raw_request()
+  * DO NOT USE in hid drivers directly, but through hid_hw_request instead.
+  */
+ void __hid_request(struct hid_device *hid, struct hid_report *report,
+               int reqtype)
+ {
+       char *buf;
+       int ret;
+       int len;
+       buf = hid_alloc_report_buf(report, GFP_KERNEL);
+       if (!buf)
+               return;
+       len = hid_report_len(report);
+       if (reqtype == HID_REQ_SET_REPORT)
+               hid_output_report(report, buf);
+       ret = hid->ll_driver->raw_request(hid, report->id, buf, len,
+                                         report->type, reqtype);
+       if (ret < 0) {
+               dbg_hid("unable to complete request: %d\n", ret);
+               goto out;
+       }
+       if (reqtype == HID_REQ_GET_REPORT)
+               hid_input_report(hid, report->type, buf, ret, 0);
+ out:
+       kfree(buf);
+ }
+ EXPORT_SYMBOL_GPL(__hid_request);
  int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
                int interrupt)
  {
@@@ -1679,7 -1719,6 +1719,7 @@@ static const struct hid_device_id hid_h
        { 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_ANSI) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
 +      { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },
        { 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_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_CP2112) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
@@@ -2431,6 -2469,14 +2472,14 @@@ int hid_add_device(struct hid_device *h
        if (hid_ignore(hdev))
                return -ENODEV;
  
+       /*
+        * Check for the mandatory transport channel.
+        */
+        if (!hdev->ll_driver->raw_request) {
+               hid_err(hdev, "transport driver missing .raw_request()\n");
+               return -EINVAL;
+        }
        /*
         * Read the device report descriptor once and use as template
         * for the driver-specific modifications.
diff --combined drivers/hid/hid-hyperv.c
index c24908f14934f4d788263d3a768ae69797913769,0658cc4578fe1b1165c2a129c1d8c25497906937..f52dbcb7133b4fac11f798638c4911fa896e2e55
@@@ -157,7 -157,6 +157,7 @@@ struct mousevsc_dev 
        u32                     report_desc_size;
        struct hv_input_dev_info hid_dev_info;
        struct hid_device       *hid_device;
 +      u8                      input_buf[HID_MAX_BUFFER_SIZE];
  };
  
  
@@@ -257,7 -256,6 +257,7 @@@ static void mousevsc_on_receive(struct 
        struct synthhid_msg *hid_msg;
        struct mousevsc_dev *input_dev = hv_get_drvdata(device);
        struct synthhid_input_report *input_report;
 +      size_t len;
  
        pipe_msg = (struct pipe_prt_msg *)((unsigned long)packet +
                                                (packet->offset8 << 3));
                        (struct synthhid_input_report *)pipe_msg->data;
                if (!input_dev->init_complete)
                        break;
 -              hid_input_report(input_dev->hid_device,
 -                              HID_INPUT_REPORT, input_report->buffer,
 -                              input_report->header.size, 1);
 +
 +              len = min(input_report->header.size,
 +                        (u32)sizeof(input_dev->input_buf));
 +              memcpy(input_dev->input_buf, input_report->buffer, len);
 +              hid_input_report(input_dev->hid_device, HID_INPUT_REPORT,
 +                               input_dev->input_buf, len, 1);
                break;
        default:
                pr_err("unsupported hid msg type - type %d len %d",
@@@ -460,12 -455,22 +460,22 @@@ static void mousevsc_hid_stop(struct hi
  {
  }
  
+ static int mousevsc_hid_raw_request(struct hid_device *hid,
+                                   unsigned char report_num,
+                                   __u8 *buf, size_t len,
+                                   unsigned char rtype,
+                                   int reqtype)
+ {
+       return 0;
+ }
  static struct hid_ll_driver mousevsc_ll_driver = {
        .parse = mousevsc_hid_parse,
        .open = mousevsc_hid_open,
        .close = mousevsc_hid_close,
        .start = mousevsc_hid_start,
        .stop = mousevsc_hid_stop,
+       .raw_request = mousevsc_hid_raw_request,
  };
  
  static struct hid_driver mousevsc_hid_driver;
diff --combined drivers/hid/hid-ids.h
index 00fd7452722f5a9336ec51c2c050a107031e90c9,239f29c1c85c14f64fe5d51ff1a935b98377d06c..5c34e658fd5983bb61b85ac7bb4cccc4964360b6
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI  0x0255
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256
 +#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS   0x0257
  #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI  0x0290
  #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO   0x0291
  #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS   0x0292
  
  #define USB_VENDOR_ID_CYGNAL          0x10c4
  #define USB_DEVICE_ID_CYGNAL_RADIO_SI470X     0x818a
 +#define USB_DEVICE_ID_FOCALTECH_FTXXXX_MULTITOUCH     0x81b9
+ #define USB_DEVICE_ID_CYGNAL_CP2112   0xea90
  
  #define USB_VENDOR_ID_CYPRESS         0x04b4
  #define USB_DEVICE_ID_CYPRESS_MOUSE   0x0001
  #define USB_VENDOR_ID_INTEL_1         0x8087
  #define USB_DEVICE_ID_INTEL_HID_SENSOR        0x09fa
  
 +#define USB_VENDOR_ID_STM_0             0x0483
 +#define USB_DEVICE_ID_STM_HID_SENSOR    0x91d1
 +
  #define USB_VENDOR_ID_ION             0x15e4
  #define USB_DEVICE_ID_ICADE           0x0132
  
  #define USB_DEVICE_ID_MS_PRESENTER_8K_USB     0x0713
  #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K     0x0730
  #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500   0x076c
 +#define USB_DEVICE_ID_MS_TOUCH_COVER_2        0x07a7
 +#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
  
  #define USB_VENDOR_ID_MOJO            0x8282
  #define USB_DEVICE_ID_RETRO_ADAPTER   0x3201
  
  #define USB_VENDOR_ID_NEXIO           0x1870
  #define USB_DEVICE_ID_NEXIO_MULTITOUCH_420    0x010d
 +#define USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750        0x0110
  
  #define USB_VENDOR_ID_NEXTWINDOW      0x1926
  #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN  0x0003
diff --combined drivers/hid/hid-input.c
index a713e6211419c880ddd0a39597b78f16ad84919a,f5aef792f13b6dd235bdfcaf0b43cf6f9802cc48..333190f771f5f43afff8124ef4ca8279d3308acf
@@@ -350,9 -350,9 +350,9 @@@ static int hidinput_get_battery_propert
                        ret = -ENOMEM;
                        break;
                }
-               ret = dev->hid_get_raw_report(dev, dev->battery_report_id,
-                                             buf, 2,
-                                             dev->battery_report_type);
+               ret = hid_hw_raw_request(dev, dev->battery_report_id, buf, 2,
+                                        dev->battery_report_type,
+                                        HID_REQ_GET_REPORT);
  
                if (ret != 2) {
                        ret = -ENODATA;
@@@ -1150,7 -1150,7 +1150,7 @@@ static void hidinput_led_worker(struct 
                                              led_work);
        struct hid_field *field;
        struct hid_report *report;
-       int len;
+       int len, ret;
        __u8 *buf;
  
        field = hidinput_get_led_field(hid);
  
        /* fall back to generic raw-output-report */
        len = ((report->size - 1) >> 3) + 1 + (report->id > 0);
 -      buf = kmalloc(len, GFP_KERNEL);
 +      buf = hid_alloc_report_buf(report, GFP_KERNEL);
        if (!buf)
                return;
  
        hid_output_report(report, buf);
        /* synchronous output report */
-       hid->hid_output_raw_report(hid, buf, len, HID_OUTPUT_REPORT);
+       ret = hid_hw_output_report(hid, buf, len);
+       if (ret == -ENOSYS)
+               hid_hw_raw_request(hid, report->id, buf, len, HID_OUTPUT_REPORT,
+                               HID_REQ_SET_REPORT);
        kfree(buf);
  }
  
@@@ -1263,10 -1266,7 +1266,7 @@@ static struct hid_input *hidinput_alloc
        }
  
        input_set_drvdata(input_dev, hid);
-       if (hid->ll_driver->hidinput_input_event)
-               input_dev->event = hid->ll_driver->hidinput_input_event;
-       else if (hid->ll_driver->request || hid->hid_output_raw_report)
-               input_dev->event = hidinput_input_event;
+       input_dev->event = hidinput_input_event;
        input_dev->open = hidinput_open;
        input_dev->close = hidinput_close;
        input_dev->setkeycode = hidinput_setkeycode;
diff --combined drivers/hid/hid-sony.c
index 2f19b15f47f2ffca68de731ef0e0ba3ae53c972b,4884bb567bf88ab0a71030c6eb9666c4fc88cbab..b3e82585309e51ec85297d4be4e797871a71f21a
@@@ -17,7 -17,8 +17,8 @@@
   * any later version.
   */
  
- /* NOTE: in order for the Sony PS3 BD Remote Control to be found by
+ /*
+  * NOTE: in order for the Sony PS3 BD Remote Control to be found by
   * a Bluetooth host, the key combination Start+Enter has to be kept pressed
   * for about 7 seconds with the Bluetooth Host Controller in discovering mode.
   *
  #include <linux/hid.h>
  #include <linux/module.h>
  #include <linux/slab.h>
- #include <linux/usb.h>
  #include <linux/leds.h>
+ #include <linux/power_supply.h>
+ #include <linux/spinlock.h>
+ #include <linux/list.h>
+ #include <linux/input/mt.h>
  
  #include "hid-ids.h"
  
  #define DUALSHOCK4_CONTROLLER_USB BIT(5)
  #define DUALSHOCK4_CONTROLLER_BT  BIT(6)
  
- #define SONY_LED_SUPPORT (SIXAXIS_CONTROLLER_USB | BUZZ_CONTROLLER | DUALSHOCK4_CONTROLLER_USB)
- #define SONY_FF_SUPPORT (SIXAXIS_CONTROLLER_USB | DUALSHOCK4_CONTROLLER_USB)
+ #define SIXAXIS_CONTROLLER (SIXAXIS_CONTROLLER_USB | SIXAXIS_CONTROLLER_BT)
+ #define DUALSHOCK4_CONTROLLER (DUALSHOCK4_CONTROLLER_USB |\
+                               DUALSHOCK4_CONTROLLER_BT)
+ #define SONY_LED_SUPPORT (SIXAXIS_CONTROLLER | BUZZ_CONTROLLER |\
+                               DUALSHOCK4_CONTROLLER)
+ #define SONY_BATTERY_SUPPORT (SIXAXIS_CONTROLLER | DUALSHOCK4_CONTROLLER)
+ #define SONY_FF_SUPPORT (SIXAXIS_CONTROLLER | DUALSHOCK4_CONTROLLER)
  
  #define MAX_LEDS 4
  
@@@ -74,7 -83,8 +83,8 @@@ static const u8 sixaxis_rdesc_fixup2[] 
        0xb1, 0x02, 0xc0, 0xc0,
  };
  
- /* The default descriptor doesn't provide mapping for the accelerometers
+ /*
+  * The default descriptor doesn't provide mapping for the accelerometers
   * or orientation sensors.  This fixed descriptor maps the accelerometers
   * to usage values 0x40, 0x41 and 0x42 and maps the orientation sensors
   * to usage values 0x43, 0x44 and 0x45.
@@@ -333,6 -343,217 +343,217 @@@ static u8 dualshock4_usb_rdesc[] = 
        0xC0                /*  End Collection                      */
  };
  
+ /*
+  * The default behavior of the Dualshock 4 is to send reports using report
+  * type 1 when running over Bluetooth. However, as soon as it receives a
+  * report of type 17 to set the LEDs or rumble it starts returning it's state
+  * in report 17 instead of 1.  Since report 17 is undefined in the default HID
+  * descriptor the button and axis definitions must be moved to report 17 or
+  * the HID layer won't process the received input once a report is sent.
+  */
+ static u8 dualshock4_bt_rdesc[] = {
+       0x05, 0x01,         /*  Usage Page (Desktop),               */
+       0x09, 0x05,         /*  Usage (Gamepad),                    */
+       0xA1, 0x01,         /*  Collection (Application),           */
+       0x85, 0x01,         /*      Report ID (1),                  */
+       0x75, 0x08,         /*      Report Size (8),                */
+       0x95, 0x0A,         /*      Report Count (9),               */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x06, 0x04, 0xFF,   /*      Usage Page (FF04h),             */
+       0x85, 0x02,         /*      Report ID (2),                  */
+       0x09, 0x24,         /*      Usage (24h),                    */
+       0x95, 0x24,         /*      Report Count (36),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA3,         /*      Report ID (163),                */
+       0x09, 0x25,         /*      Usage (25h),                    */
+       0x95, 0x30,         /*      Report Count (48),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x05,         /*      Report ID (5),                  */
+       0x09, 0x26,         /*      Usage (26h),                    */
+       0x95, 0x28,         /*      Report Count (40),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x06,         /*      Report ID (6),                  */
+       0x09, 0x27,         /*      Usage (27h),                    */
+       0x95, 0x34,         /*      Report Count (52),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x07,         /*      Report ID (7),                  */
+       0x09, 0x28,         /*      Usage (28h),                    */
+       0x95, 0x30,         /*      Report Count (48),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x08,         /*      Report ID (8),                  */
+       0x09, 0x29,         /*      Usage (29h),                    */
+       0x95, 0x2F,         /*      Report Count (47),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x06, 0x03, 0xFF,   /*      Usage Page (FF03h),             */
+       0x85, 0x03,         /*      Report ID (3),                  */
+       0x09, 0x21,         /*      Usage (21h),                    */
+       0x95, 0x26,         /*      Report Count (38),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x04,         /*      Report ID (4),                  */
+       0x09, 0x22,         /*      Usage (22h),                    */
+       0x95, 0x2E,         /*      Report Count (46),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xF0,         /*      Report ID (240),                */
+       0x09, 0x47,         /*      Usage (47h),                    */
+       0x95, 0x3F,         /*      Report Count (63),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xF1,         /*      Report ID (241),                */
+       0x09, 0x48,         /*      Usage (48h),                    */
+       0x95, 0x3F,         /*      Report Count (63),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xF2,         /*      Report ID (242),                */
+       0x09, 0x49,         /*      Usage (49h),                    */
+       0x95, 0x0F,         /*      Report Count (15),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x11,         /*      Report ID (17),                 */
+       0x06, 0x00, 0xFF,   /*      Usage Page (FF00h),             */
+       0x09, 0x20,         /*      Usage (20h),                    */
+       0x95, 0x02,         /*      Report Count (2),               */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x05, 0x01,         /*      Usage Page (Desktop),           */
+       0x09, 0x30,         /*      Usage (X),                      */
+       0x09, 0x31,         /*      Usage (Y),                      */
+       0x09, 0x32,         /*      Usage (Z),                      */
+       0x09, 0x35,         /*      Usage (Rz),                     */
+       0x15, 0x00,         /*      Logical Minimum (0),            */
+       0x26, 0xFF, 0x00,   /*      Logical Maximum (255),          */
+       0x75, 0x08,         /*      Report Size (8),                */
+       0x95, 0x04,         /*      Report Count (4),               */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x09, 0x39,         /*      Usage (Hat Switch),             */
+       0x15, 0x00,         /*      Logical Minimum (0),            */
+       0x25, 0x07,         /*      Logical Maximum (7),            */
+       0x75, 0x04,         /*      Report Size (4),                */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0x81, 0x42,         /*      Input (Variable, Null State),   */
+       0x05, 0x09,         /*      Usage Page (Button),            */
+       0x19, 0x01,         /*      Usage Minimum (01h),            */
+       0x29, 0x0E,         /*      Usage Maximum (0Eh),            */
+       0x15, 0x00,         /*      Logical Minimum (0),            */
+       0x25, 0x01,         /*      Logical Maximum (1),            */
+       0x75, 0x01,         /*      Report Size (1),                */
+       0x95, 0x0E,         /*      Report Count (14),              */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x75, 0x06,         /*      Report Size (6),                */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0x81, 0x01,         /*      Input (Constant),               */
+       0x05, 0x01,         /*      Usage Page (Desktop),           */
+       0x09, 0x33,         /*      Usage (Rx),                     */
+       0x09, 0x34,         /*      Usage (Ry),                     */
+       0x15, 0x00,         /*      Logical Minimum (0),            */
+       0x26, 0xFF, 0x00,   /*      Logical Maximum (255),          */
+       0x75, 0x08,         /*      Report Size (8),                */
+       0x95, 0x02,         /*      Report Count (2),               */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x06, 0x00, 0xFF,   /*      Usage Page (FF00h),             */
+       0x09, 0x20,         /*      Usage (20h),                    */
+       0x95, 0x03,         /*      Report Count (3),               */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x05, 0x01,         /*      Usage Page (Desktop),           */
+       0x19, 0x40,         /*      Usage Minimum (40h),            */
+       0x29, 0x42,         /*      Usage Maximum (42h),            */
+       0x16, 0x00, 0x80,   /*      Logical Minimum (-32768),       */
+       0x26, 0x00, 0x7F,   /*      Logical Maximum (32767),        */
+       0x75, 0x10,         /*      Report Size (16),               */
+       0x95, 0x03,         /*      Report Count (3),               */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x19, 0x43,         /*      Usage Minimum (43h),            */
+       0x29, 0x45,         /*      Usage Maximum (45h),            */
+       0x16, 0xFF, 0xBF,   /*      Logical Minimum (-16385),       */
+       0x26, 0x00, 0x40,   /*      Logical Maximum (16384),        */
+       0x95, 0x03,         /*      Report Count (3),               */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x06, 0x00, 0xFF,   /*      Usage Page (FF00h),             */
+       0x09, 0x20,         /*      Usage (20h),                    */
+       0x15, 0x00,         /*      Logical Minimum (0),            */
+       0x26, 0xFF, 0x00,   /*      Logical Maximum (255),          */
+       0x75, 0x08,         /*      Report Size (8),                */
+       0x95, 0x31,         /*      Report Count (51),              */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x09, 0x21,         /*      Usage (21h),                    */
+       0x75, 0x08,         /*      Report Size (8),                */
+       0x95, 0x4D,         /*      Report Count (77),              */
+       0x91, 0x02,         /*      Output (Variable),              */
+       0x85, 0x12,         /*      Report ID (18),                 */
+       0x09, 0x22,         /*      Usage (22h),                    */
+       0x95, 0x8D,         /*      Report Count (141),             */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x09, 0x23,         /*      Usage (23h),                    */
+       0x91, 0x02,         /*      Output (Variable),              */
+       0x85, 0x13,         /*      Report ID (19),                 */
+       0x09, 0x24,         /*      Usage (24h),                    */
+       0x95, 0xCD,         /*      Report Count (205),             */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x09, 0x25,         /*      Usage (25h),                    */
+       0x91, 0x02,         /*      Output (Variable),              */
+       0x85, 0x14,         /*      Report ID (20),                 */
+       0x09, 0x26,         /*      Usage (26h),                    */
+       0x96, 0x0D, 0x01,   /*      Report Count (269),             */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x09, 0x27,         /*      Usage (27h),                    */
+       0x91, 0x02,         /*      Output (Variable),              */
+       0x85, 0x15,         /*      Report ID (21),                 */
+       0x09, 0x28,         /*      Usage (28h),                    */
+       0x96, 0x4D, 0x01,   /*      Report Count (333),             */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x09, 0x29,         /*      Usage (29h),                    */
+       0x91, 0x02,         /*      Output (Variable),              */
+       0x85, 0x16,         /*      Report ID (22),                 */
+       0x09, 0x2A,         /*      Usage (2Ah),                    */
+       0x96, 0x8D, 0x01,   /*      Report Count (397),             */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x09, 0x2B,         /*      Usage (2Bh),                    */
+       0x91, 0x02,         /*      Output (Variable),              */
+       0x85, 0x17,         /*      Report ID (23),                 */
+       0x09, 0x2C,         /*      Usage (2Ch),                    */
+       0x96, 0xCD, 0x01,   /*      Report Count (461),             */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x09, 0x2D,         /*      Usage (2Dh),                    */
+       0x91, 0x02,         /*      Output (Variable),              */
+       0x85, 0x18,         /*      Report ID (24),                 */
+       0x09, 0x2E,         /*      Usage (2Eh),                    */
+       0x96, 0x0D, 0x02,   /*      Report Count (525),             */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x09, 0x2F,         /*      Usage (2Fh),                    */
+       0x91, 0x02,         /*      Output (Variable),              */
+       0x85, 0x19,         /*      Report ID (25),                 */
+       0x09, 0x30,         /*      Usage (30h),                    */
+       0x96, 0x22, 0x02,   /*      Report Count (546),             */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x09, 0x31,         /*      Usage (31h),                    */
+       0x91, 0x02,         /*      Output (Variable),              */
+       0x06, 0x80, 0xFF,   /*      Usage Page (FF80h),             */
+       0x85, 0x82,         /*      Report ID (130),                */
+       0x09, 0x22,         /*      Usage (22h),                    */
+       0x95, 0x3F,         /*      Report Count (63),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x83,         /*      Report ID (131),                */
+       0x09, 0x23,         /*      Usage (23h),                    */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x84,         /*      Report ID (132),                */
+       0x09, 0x24,         /*      Usage (24h),                    */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x90,         /*      Report ID (144),                */
+       0x09, 0x30,         /*      Usage (30h),                    */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x91,         /*      Report ID (145),                */
+       0x09, 0x31,         /*      Usage (31h),                    */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x92,         /*      Report ID (146),                */
+       0x09, 0x32,         /*      Usage (32h),                    */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x93,         /*      Report ID (147),                */
+       0x09, 0x33,         /*      Usage (33h),                    */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA0,         /*      Report ID (160),                */
+       0x09, 0x40,         /*      Usage (40h),                    */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA4,         /*      Report ID (164),                */
+       0x09, 0x44,         /*      Usage (44h),                    */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0xC0                /*  End Collection                      */
+ };
  static __u8 ps3remote_rdesc[] = {
        0x05, 0x01,          /* GUsagePage Generic Desktop */
        0x09, 0x05,          /* LUsage 0x05 [Game Pad] */
@@@ -450,7 -671,8 +671,8 @@@ static const unsigned int ps3remote_key
  };
  
  static const unsigned int buzz_keymap[] = {
-       /* The controller has 4 remote buzzers, each with one LED and 5
+       /*
+        * The controller has 4 remote buzzers, each with one LED and 5
         * buttons.
         * 
         * We use the mapping chosen by the controller, which is:
        [20] = BTN_TRIGGER_HAPPY20,
  };
  
+ static enum power_supply_property sony_battery_props[] = {
+       POWER_SUPPLY_PROP_PRESENT,
+       POWER_SUPPLY_PROP_CAPACITY,
+       POWER_SUPPLY_PROP_SCOPE,
+       POWER_SUPPLY_PROP_STATUS,
+ };
+ static spinlock_t sony_dev_list_lock;
+ static LIST_HEAD(sony_device_list);
  struct sony_sc {
+       spinlock_t lock;
+       struct list_head list_node;
        struct hid_device *hdev;
        struct led_classdev *leds[MAX_LEDS];
-       struct hid_report *output_report;
        unsigned long quirks;
        struct work_struct state_worker;
+       struct power_supply battery;
  
  #ifdef CONFIG_SONY_FF
        __u8 left;
        __u8 right;
  #endif
  
+       __u8 mac_address[6];
        __u8 worker_initialized;
+       __u8 cable_state;
+       __u8 battery_charging;
+       __u8 battery_capacity;
        __u8 led_state[MAX_LEDS];
        __u8 led_count;
  };
@@@ -578,6 -816,10 +816,10 @@@ static __u8 *sony_report_fixup(struct h
                hid_info(hdev, "Using modified Dualshock 4 report descriptor with gyroscope axes\n");
                rdesc = dualshock4_usb_rdesc;
                *rsize = sizeof(dualshock4_usb_rdesc);
+       } else if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) && *rsize == 357) {
+               hid_info(hdev, "Using modified Dualshock 4 Bluetooth report descriptor\n");
+               rdesc = dualshock4_bt_rdesc;
+               *rsize = sizeof(dualshock4_bt_rdesc);
        }
  
        /* The HID descriptor exposed over BT has a trailing zero byte */
        return rdesc;
  }
  
+ static void sixaxis_parse_report(struct sony_sc *sc, __u8 *rd, int size)
+ {
+       static const __u8 sixaxis_battery_capacity[] = { 0, 1, 25, 50, 75, 100 };
+       unsigned long flags;
+       __u8 cable_state, battery_capacity, battery_charging;
+       /*
+        * The sixaxis is charging if the battery value is 0xee
+        * and it is fully charged if the value is 0xef.
+        * It does not report the actual level while charging so it
+        * is set to 100% while charging is in progress.
+        */
+       if (rd[30] >= 0xee) {
+               battery_capacity = 100;
+               battery_charging = !(rd[30] & 0x01);
+       } else {
+               __u8 index = rd[30] <= 5 ? rd[30] : 5;
+               battery_capacity = sixaxis_battery_capacity[index];
+               battery_charging = 0;
+       }
+       cable_state = !((rd[31] >> 4) & 0x01);
+       spin_lock_irqsave(&sc->lock, flags);
+       sc->cable_state = cable_state;
+       sc->battery_capacity = battery_capacity;
+       sc->battery_charging = battery_charging;
+       spin_unlock_irqrestore(&sc->lock, flags);
+ }
+ static void dualshock4_parse_report(struct sony_sc *sc, __u8 *rd, int size)
+ {
+       struct hid_input *hidinput = list_entry(sc->hdev->inputs.next,
+                                               struct hid_input, list);
+       struct input_dev *input_dev = hidinput->input;
+       unsigned long flags;
+       int n, offset;
+       __u8 cable_state, battery_capacity, battery_charging;
+       /*
+        * Battery and touchpad data starts at byte 30 in the USB report and
+        * 32 in Bluetooth report.
+        */
+       offset = (sc->quirks & DUALSHOCK4_CONTROLLER_USB) ? 30 : 32;
+       /*
+        * The lower 4 bits of byte 30 contain the battery level
+        * and the 5th bit contains the USB cable state.
+        */
+       cable_state = (rd[offset] >> 4) & 0x01;
+       battery_capacity = rd[offset] & 0x0F;
+       /*
+        * When a USB power source is connected the battery level ranges from
+        * 0 to 10, and when running on battery power it ranges from 0 to 9.
+        * A battery level above 10 when plugged in means charge completed.
+        */
+       if (!cable_state || battery_capacity > 10)
+               battery_charging = 0;
+       else
+               battery_charging = 1;
+       if (!cable_state)
+               battery_capacity++;
+       if (battery_capacity > 10)
+               battery_capacity = 10;
+       battery_capacity *= 10;
+       spin_lock_irqsave(&sc->lock, flags);
+       sc->cable_state = cable_state;
+       sc->battery_capacity = battery_capacity;
+       sc->battery_charging = battery_charging;
+       spin_unlock_irqrestore(&sc->lock, flags);
+       offset += 5;
+       /*
+        * The Dualshock 4 multi-touch trackpad data starts at offset 35 on USB
+        * and 37 on Bluetooth.
+        * The first 7 bits of the first byte is a counter and bit 8 is a touch
+        * indicator that is 0 when pressed and 1 when not pressed.
+        * The next 3 bytes are two 12 bit touch coordinates, X and Y.
+        * The data for the second touch is in the same format and immediatly
+        * follows the data for the first.
+        */
+       for (n = 0; n < 2; n++) {
+               __u16 x, y;
+               x = rd[offset+1] | ((rd[offset+2] & 0xF) << 8);
+               y = ((rd[offset+2] & 0xF0) >> 4) | (rd[offset+3] << 4);
+               input_mt_slot(input_dev, n);
+               input_mt_report_slot_state(input_dev, MT_TOOL_FINGER,
+                                       !(rd[offset] >> 7));
+               input_report_abs(input_dev, ABS_MT_POSITION_X, x);
+               input_report_abs(input_dev, ABS_MT_POSITION_Y, y);
+               offset += 4;
+       }
+ }
  static int sony_raw_event(struct hid_device *hdev, struct hid_report *report,
                __u8 *rd, int size)
  {
        struct sony_sc *sc = hid_get_drvdata(hdev);
  
-       /* Sixaxis HID report has acclerometers/gyro with MSByte first, this
+       /*
+        * Sixaxis HID report has acclerometers/gyro with MSByte first, this
         * has to be BYTE_SWAPPED before passing up to joystick interface
         */
-       if ((sc->quirks & (SIXAXIS_CONTROLLER_USB | SIXAXIS_CONTROLLER_BT)) &&
-                       rd[0] == 0x01 && size == 49) {
+       if ((sc->quirks & SIXAXIS_CONTROLLER) && rd[0] == 0x01 && size == 49) {
                swap(rd[41], rd[42]);
                swap(rd[43], rd[44]);
                swap(rd[45], rd[46]);
                swap(rd[47], rd[48]);
+               sixaxis_parse_report(sc, rd, size);
+       } else if (((sc->quirks & DUALSHOCK4_CONTROLLER_USB) && rd[0] == 0x01 &&
+                       size == 64) || ((sc->quirks & DUALSHOCK4_CONTROLLER_BT)
+                       && rd[0] == 0x11 && size == 78)) {
+               dualshock4_parse_report(sc, rd, size);
        }
  
        return 0;
@@@ -656,45 -1005,6 +1005,6 @@@ static int sony_mapping(struct hid_devi
        return 0;
  }
  
- /*
-  * The Sony Sixaxis does not handle HID Output Reports on the Interrupt EP
-  * like it should according to usbhid/hid-core.c::usbhid_output_raw_report()
-  * so we need to override that forcing HID Output Reports on the Control EP.
-  *
-  * There is also another issue about HID Output Reports via USB, the Sixaxis
-  * does not want the report_id as part of the data packet, so we have to
-  * discard buf[0] when sending the actual control message, even for numbered
-  * reports, humpf!
-  */
- static int sixaxis_usb_output_raw_report(struct hid_device *hid, __u8 *buf,
-               size_t count, unsigned char report_type)
- {
-       struct usb_interface *intf = to_usb_interface(hid->dev.parent);
-       struct usb_device *dev = interface_to_usbdev(intf);
-       struct usb_host_interface *interface = intf->cur_altsetting;
-       int report_id = buf[0];
-       int ret;
-       if (report_type == HID_OUTPUT_REPORT) {
-               /* Don't send the Report ID */
-               buf++;
-               count--;
-       }
-       ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-               HID_REQ_SET_REPORT,
-               USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-               ((report_type + 1) << 8) | report_id,
-               interface->desc.bInterfaceNumber, buf, count,
-               USB_CTRL_SET_TIMEOUT);
-       /* Count also the Report ID, in case of an Output report. */
-       if (ret > 0 && report_type == HID_OUTPUT_REPORT)
-               ret++;
-       return ret;
- }
  /*
   * Sending HID_REQ_GET_REPORT changes the operation mode of the ps3 controller
   * to "operational".  Without this, the ps3 controller will not report any
@@@ -708,7 -1018,8 +1018,8 @@@ static int sixaxis_set_operational_usb(
        if (!buf)
                return -ENOMEM;
  
-       ret = hdev->hid_get_raw_report(hdev, 0xf2, buf, 17, HID_FEATURE_REPORT);
+       ret = hid_hw_raw_request(hdev, 0xf2, buf, 17, HID_FEATURE_REPORT,
+                                HID_REQ_GET_REPORT);
  
        if (ret < 0)
                hid_err(hdev, "can't set operational mode\n");
  static int sixaxis_set_operational_bt(struct hid_device *hdev)
  {
        unsigned char buf[] = { 0xf4,  0x42, 0x03, 0x00, 0x00 };
-       return hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT);
+       return hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
+                                 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+ }
+ /*
+  * Requesting feature report 0x02 in Bluetooth mode changes the state of the
+  * controller so that it sends full input reports of type 0x11.
+  */
+ static int dualshock4_set_operational_bt(struct hid_device *hdev)
+ {
+       __u8 buf[37] = { 0 };
+       return hid_hw_raw_request(hdev, 0x02, buf, sizeof(buf),
+                               HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
  }
  
  static void buzz_set_leds(struct hid_device *hdev, const __u8 *leds)
@@@ -751,8 -1075,7 +1075,7 @@@ static void sony_set_leds(struct hid_de
  
        if (drv_data->quirks & BUZZ_CONTROLLER && count == 4) {
                buzz_set_leds(hdev, leds);
-       } else if ((drv_data->quirks & SIXAXIS_CONTROLLER_USB) ||
-                  (drv_data->quirks & DUALSHOCK4_CONTROLLER_USB)) {
+       } else {
                for (n = 0; n < count; n++)
                        drv_data->led_state[n] = leds[n];
                schedule_work(&drv_data->state_worker);
@@@ -792,7 -1115,6 +1115,6 @@@ static enum led_brightness sony_led_get
        struct sony_sc *drv_data;
  
        int n;
-       int on = 0;
  
        drv_data = hid_get_drvdata(hdev);
        if (!drv_data) {
        }
  
        for (n = 0; n < drv_data->led_count; n++) {
-               if (led == drv_data->leds[n]) {
-                       on = !!(drv_data->led_state[n]);
-                       break;
-               }
+               if (led == drv_data->leds[n])
+                       return drv_data->led_state[n];
        }
  
-       return on ? LED_FULL : LED_OFF;
+       return LED_OFF;
  }
  
  static void sony_leds_remove(struct hid_device *hdev)
@@@ -857,7 -1177,7 +1177,7 @@@ static int sony_leds_init(struct hid_de
                /* Validate expected report characteristics. */
                if (!hid_validate_values(hdev, HID_OUTPUT_REPORT, 0, 0, 7))
                        return -ENODEV;
-       } else if (drv_data->quirks & DUALSHOCK4_CONTROLLER_USB) {
+       } else if (drv_data->quirks & DUALSHOCK4_CONTROLLER) {
                drv_data->led_count = 3;
                max_brightness = 255;
                use_colors = 1;
                name_fmt = "%s::sony%d";
        }
  
-       /* Clear LEDs as we have no way of reading their initial state. This is
+       /*
+        * Clear LEDs as we have no way of reading their initial state. This is
         * only relevant if the driver is loaded after somebody actively set the
-        * LEDs to on */
+        * LEDs to on
+        */
        sony_set_leds(hdev, initial_values, drv_data->led_count);
  
        name_sz = strlen(dev_name(&hdev->dev)) + name_len + 1;
@@@ -943,29 -1265,45 +1265,45 @@@ static void sixaxis_state_worker(struc
        buf[10] |= sc->led_state[2] << 3;
        buf[10] |= sc->led_state[3] << 4;
  
-       sc->hdev->hid_output_raw_report(sc->hdev, buf, sizeof(buf),
-                                       HID_OUTPUT_REPORT);
+       hid_hw_raw_request(sc->hdev, 0x01, buf, sizeof(buf), HID_OUTPUT_REPORT,
+                       HID_REQ_SET_REPORT);
  }
  
  static void dualshock4_state_worker(struct work_struct *work)
  {
        struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
        struct hid_device *hdev = sc->hdev;
-       struct hid_report *report = sc->output_report;
-       __s32 *value = report->field[0]->value;
+       int offset;
+       __u8 buf[78] = { 0 };
  
-       value[0] = 0x03;
+       if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
+               buf[0] = 0x05;
+               buf[1] = 0x03;
+               offset = 4;
+       } else {
+               buf[0] = 0x11;
+               buf[1] = 0xB0;
+               buf[3] = 0x0F;
+               offset = 6;
+       }
  
  #ifdef CONFIG_SONY_FF
-       value[3] = sc->right;
-       value[4] = sc->left;
+       buf[offset++] = sc->right;
+       buf[offset++] = sc->left;
+ #else
+       offset += 2;
  #endif
  
-       value[5] = sc->led_state[0];
-       value[6] = sc->led_state[1];
-       value[7] = sc->led_state[2];
+       buf[offset++] = sc->led_state[0];
+       buf[offset++] = sc->led_state[1];
+       buf[offset++] = sc->led_state[2];
  
-       hid_hw_request(hdev, report, HID_REQ_SET_REPORT);
+       if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
+               hid_hw_output_report(hdev, buf, 32);
+       else
+               hid_hw_raw_request(hdev, 0x11, buf, 78,
+                               HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
  }
  
  #ifdef CONFIG_SONY_FF
@@@ -1000,35 -1338,247 +1338,247 @@@ static int sony_init_ff(struct hid_devi
  {
        return 0;
  }
  #endif
  
- static int sony_set_output_report(struct sony_sc *sc, int req_id, int req_size)
+ static int sony_battery_get_property(struct power_supply *psy,
+                                    enum power_supply_property psp,
+                                    union power_supply_propval *val)
+ {
+       struct sony_sc *sc = container_of(psy, struct sony_sc, battery);
+       unsigned long flags;
+       int ret = 0;
+       u8 battery_charging, battery_capacity, cable_state;
+       spin_lock_irqsave(&sc->lock, flags);
+       battery_charging = sc->battery_charging;
+       battery_capacity = sc->battery_capacity;
+       cable_state = sc->cable_state;
+       spin_unlock_irqrestore(&sc->lock, flags);
+       switch (psp) {
+       case POWER_SUPPLY_PROP_PRESENT:
+               val->intval = 1;
+               break;
+       case POWER_SUPPLY_PROP_SCOPE:
+               val->intval = POWER_SUPPLY_SCOPE_DEVICE;
+               break;
+       case POWER_SUPPLY_PROP_CAPACITY:
+               val->intval = battery_capacity;
+               break;
+       case POWER_SUPPLY_PROP_STATUS:
+               if (battery_charging)
+                       val->intval = POWER_SUPPLY_STATUS_CHARGING;
+               else
+                       if (battery_capacity == 100 && cable_state)
+                               val->intval = POWER_SUPPLY_STATUS_FULL;
+                       else
+                               val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+       return ret;
+ }
+ static int sony_battery_probe(struct sony_sc *sc)
  {
-       struct list_head *head, *list;
-       struct hid_report *report;
+       static atomic_t power_id_seq = ATOMIC_INIT(0);
+       unsigned long power_id;
        struct hid_device *hdev = sc->hdev;
+       int ret;
  
-       list = &hdev->report_enum[HID_OUTPUT_REPORT].report_list;
+       /*
+        * Set the default battery level to 100% to avoid low battery warnings
+        * if the battery is polled before the first device report is received.
+        */
+       sc->battery_capacity = 100;
+       power_id = (unsigned long)atomic_inc_return(&power_id_seq);
+       sc->battery.properties = sony_battery_props;
+       sc->battery.num_properties = ARRAY_SIZE(sony_battery_props);
+       sc->battery.get_property = sony_battery_get_property;
+       sc->battery.type = POWER_SUPPLY_TYPE_BATTERY;
+       sc->battery.use_for_apm = 0;
+       sc->battery.name = kasprintf(GFP_KERNEL, "sony_controller_battery_%lu",
+                                    power_id);
+       if (!sc->battery.name)
+               return -ENOMEM;
  
-       list_for_each(head, list) {
-               report = list_entry(head, struct hid_report, list);
+       ret = power_supply_register(&hdev->dev, &sc->battery);
+       if (ret) {
+               hid_err(hdev, "Unable to register battery device\n");
+               goto err_free;
+       }
  
-               if (report->id == req_id) {
-                       if (report->size < req_size) {
-                               hid_err(hdev, "Output report 0x%02x (%i bits) is smaller than requested size (%i bits)\n",
-                                       req_id, report->size, req_size);
-                               return -EINVAL;
-                       }
-                       sc->output_report = report;
-                       return 0;
+       power_supply_powers(&sc->battery, &hdev->dev);
+       return 0;
+ err_free:
+       kfree(sc->battery.name);
+       sc->battery.name = NULL;
+       return ret;
+ }
+ static void sony_battery_remove(struct sony_sc *sc)
+ {
+       if (!sc->battery.name)
+               return;
+       power_supply_unregister(&sc->battery);
+       kfree(sc->battery.name);
+       sc->battery.name = NULL;
+ }
+ static int sony_register_touchpad(struct sony_sc *sc, int touch_count,
+                                       int w, int h)
+ {
+       struct hid_input *hidinput = list_entry(sc->hdev->inputs.next,
+                                               struct hid_input, list);
+       struct input_dev *input_dev = hidinput->input;
+       int ret;
+       ret = input_mt_init_slots(input_dev, touch_count, 0);
+       if (ret < 0) {
+               hid_err(sc->hdev, "Unable to initialize multi-touch slots\n");
+               return ret;
+       }
+       input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, w, 0, 0);
+       input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, h, 0, 0);
+       return 0;
+ }
+ /*
+  * If a controller is plugged in via USB while already connected via Bluetooth
+  * it will show up as two devices. A global list of connected controllers and
+  * their MAC addresses is maintained to ensure that a device is only connected
+  * once.
+  */
+ static int sony_check_add_dev_list(struct sony_sc *sc)
+ {
+       struct sony_sc *entry;
+       unsigned long flags;
+       int ret;
+       spin_lock_irqsave(&sony_dev_list_lock, flags);
+       list_for_each_entry(entry, &sony_device_list, list_node) {
+               ret = memcmp(sc->mac_address, entry->mac_address,
+                               sizeof(sc->mac_address));
+               if (!ret) {
+                       ret = -EEXIST;
+                       hid_info(sc->hdev, "controller with MAC address %pMR already connected\n",
+                               sc->mac_address);
+                       goto unlock;
                }
        }
  
-       hid_err(hdev, "Unable to locate output report 0x%02x\n", req_id);
+       ret = 0;
+       list_add(&(sc->list_node), &sony_device_list);
+ unlock:
+       spin_unlock_irqrestore(&sony_dev_list_lock, flags);
+       return ret;
+ }
+ static void sony_remove_dev_list(struct sony_sc *sc)
+ {
+       unsigned long flags;
  
-       return -EINVAL;
+       if (sc->list_node.next) {
+               spin_lock_irqsave(&sony_dev_list_lock, flags);
+               list_del(&(sc->list_node));
+               spin_unlock_irqrestore(&sony_dev_list_lock, flags);
+       }
  }
  
+ static int sony_get_bt_devaddr(struct sony_sc *sc)
+ {
+       int ret;
+       /* HIDP stores the device MAC address as a string in the uniq field. */
+       ret = strlen(sc->hdev->uniq);
+       if (ret != 17)
+               return -EINVAL;
+       ret = sscanf(sc->hdev->uniq,
+               "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+               &sc->mac_address[5], &sc->mac_address[4], &sc->mac_address[3],
+               &sc->mac_address[2], &sc->mac_address[1], &sc->mac_address[0]);
+       if (ret != 6)
+               return -EINVAL;
+       return 0;
+ }
+ static int sony_check_add(struct sony_sc *sc)
+ {
+       int n, ret;
+       if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) ||
+           (sc->quirks & SIXAXIS_CONTROLLER_BT)) {
+               /*
+                * sony_get_bt_devaddr() attempts to parse the Bluetooth MAC
+                * address from the uniq string where HIDP stores it.
+                * As uniq cannot be guaranteed to be a MAC address in all cases
+                * a failure of this function should not prevent the connection.
+                */
+               if (sony_get_bt_devaddr(sc) < 0) {
+                       hid_warn(sc->hdev, "UNIQ does not contain a MAC address; duplicate check skipped\n");
+                       return 0;
+               }
+       } else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
+               __u8 buf[7];
+               /*
+                * The MAC address of a DS4 controller connected via USB can be
+                * retrieved with feature report 0x81. The address begins at
+                * offset 1.
+                */
+               ret = hid_hw_raw_request(sc->hdev, 0x81, buf, sizeof(buf),
+                               HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
+               if (ret != 7) {
+                       hid_err(sc->hdev, "failed to retrieve feature report 0x81 with the DualShock 4 MAC address\n");
+                       return ret < 0 ? ret : -EINVAL;
+               }
+               memcpy(sc->mac_address, &buf[1], sizeof(sc->mac_address));
+       } else if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
+               __u8 buf[18];
+               /*
+                * The MAC address of a Sixaxis controller connected via USB can
+                * be retrieved with feature report 0xf2. The address begins at
+                * offset 4.
+                */
+               ret = hid_hw_raw_request(sc->hdev, 0xf2, buf, sizeof(buf),
+                               HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
+               if (ret != 18) {
+                       hid_err(sc->hdev, "failed to retrieve feature report 0xf2 with the Sixaxis MAC address\n");
+                       return ret < 0 ? ret : -EINVAL;
+               }
+               /*
+                * The Sixaxis device MAC in the report is big-endian and must
+                * be byte-swapped.
+                */
+               for (n = 0; n < 6; n++)
+                       sc->mac_address[5-n] = buf[4+n];
+       } else {
+               return 0;
+       }
+       return sony_check_add_dev_list(sc);
+ }
  static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
  {
        int ret;
        }
  
        if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
-               hdev->hid_output_raw_report = sixaxis_usb_output_raw_report;
+               /*
+                * The Sony Sixaxis does not handle HID Output Reports on the
+                * Interrupt EP like it could, so we need to force HID Output
+                * Reports to use HID_REQ_SET_REPORT on the Control EP.
+                *
+                * There is also another issue about HID Output Reports via USB,
+                * the Sixaxis does not want the report_id as part of the data
+                * packet, so we have to discard buf[0] when sending the actual
+                * control message, even for numbered reports, humpf!
+                */
+               hdev->quirks |= HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP;
+               hdev->quirks |= HID_QUIRK_SKIP_OUTPUT_REPORT_ID;
                ret = sixaxis_set_operational_usb(hdev);
                sc->worker_initialized = 1;
                INIT_WORK(&sc->state_worker, sixaxis_state_worker);
-       }
-       else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
+       } else if (sc->quirks & SIXAXIS_CONTROLLER_BT) {
                ret = sixaxis_set_operational_bt(hdev);
-       else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
-               /* Report 5 (31 bytes) is used to send data to the controller via USB */
-               ret = sony_set_output_report(sc, 0x05, 248);
+               sc->worker_initialized = 1;
+               INIT_WORK(&sc->state_worker, sixaxis_state_worker);
+       } else if (sc->quirks & DUALSHOCK4_CONTROLLER) {
+               if (sc->quirks & DUALSHOCK4_CONTROLLER_BT) {
+                       ret = dualshock4_set_operational_bt(hdev);
+                       if (ret < 0) {
+                               hid_err(hdev, "failed to set the Dualshock 4 operational mode\n");
+                               goto err_stop;
+                       }
+               }
+               /*
+                * The Dualshock 4 touchpad supports 2 touches and has a
+                * resolution of 1920x940.
+                */
+               ret = sony_register_touchpad(sc, 2, 1920, 940);
                if (ret < 0)
                        goto err_stop;
  
                ret = 0;
        }
  
+       if (ret < 0)
+               goto err_stop;
+       ret = sony_check_add(sc);
        if (ret < 0)
                goto err_stop;
  
                        goto err_stop;
        }
  
 +      if (sc->quirks & SONY_FF_SUPPORT) {
 +              ret = sony_init_ff(hdev);
 +              if (ret < 0)
 +                      goto err_stop;
+       if (sc->quirks & SONY_BATTERY_SUPPORT) {
+               ret = sony_battery_probe(sc);
+               if (ret < 0)
+                       goto err_stop;
+               /* Open the device to receive reports with battery info */
+               ret = hid_hw_open(hdev);
+               if (ret < 0) {
+                       hid_err(hdev, "hw open failed\n");
+                       goto err_stop;
+               }
+       }
+       if (sc->quirks & SONY_FF_SUPPORT) {
+               ret = sony_init_ff(hdev);
+               if (ret < 0)
+                       goto err_close;
        }
  
        return 0;
+ err_close:
+       hid_hw_close(hdev);
  err_stop:
        if (sc->quirks & SONY_LED_SUPPORT)
                sony_leds_remove(hdev);
+       if (sc->quirks & SONY_BATTERY_SUPPORT)
+               sony_battery_remove(sc);
+       if (sc->worker_initialized)
+               cancel_work_sync(&sc->state_worker);
+       sony_remove_dev_list(sc);
        hid_hw_stop(hdev);
        return ret;
  }
@@@ -1116,8 -1711,15 +1715,17 @@@ static void sony_remove(struct hid_devi
        if (sc->quirks & SONY_LED_SUPPORT)
                sony_leds_remove(hdev);
  
 +      if (sc->worker_initialized)
 +              cancel_work_sync(&sc->state_worker);
+       if (sc->quirks & SONY_BATTERY_SUPPORT) {
+               hid_hw_close(hdev);
+               sony_battery_remove(sc);
+       }
+       if (sc->worker_initialized)
+               cancel_work_sync(&sc->state_worker);
+       sony_remove_dev_list(sc);
  
        hid_hw_stop(hdev);
  }
diff --combined drivers/hid/hidraw.c
index ab24ce2eb28f484e30fa0994cd2781994ff7d22d,ffa648ce002ec859260ddaf623aee1986e309fc3..9c2d7c23f2966f43953626b82d03cf62bca0c8ba
@@@ -123,10 -123,6 +123,6 @@@ static ssize_t hidraw_send_report(struc
  
        dev = hidraw_table[minor]->hid;
  
-       if (!dev->hid_output_raw_report) {
-               ret = -ENODEV;
-               goto out;
-       }
  
        if (count > HID_MAX_BUFFER_SIZE) {
                hid_warn(dev, "pid %d passed too large report\n",
                goto out_free;
        }
  
-       ret = dev->hid_output_raw_report(dev, buf, count, report_type);
+       if ((report_type == HID_OUTPUT_REPORT) &&
+           !(dev->quirks & HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP)) {
+               ret = hid_hw_output_report(dev, buf, count);
+               /*
+                * compatibility with old implementation of USB-HID and I2C-HID:
+                * if the device does not support receiving output reports,
+                * on an interrupt endpoint, fallback to SET_REPORT HID command.
+                */
+               if (ret != -ENOSYS)
+                       goto out_free;
+       }
+       ret = hid_hw_raw_request(dev, buf[0], buf, count, report_type,
+                               HID_REQ_SET_REPORT);
  out_free:
        kfree(buf);
  out:
@@@ -189,7 -199,7 +199,7 @@@ static ssize_t hidraw_get_report(struc
  
        dev = hidraw_table[minor]->hid;
  
-       if (!dev->hid_get_raw_report) {
+       if (!dev->ll_driver->raw_request) {
                ret = -ENODEV;
                goto out;
        }
  
        /*
         * Read the first byte from the user. This is the report number,
-        * which is passed to dev->hid_get_raw_report().
+        * which is passed to hid_hw_raw_request().
         */
        if (copy_from_user(&report_number, buffer, 1)) {
                ret = -EFAULT;
                goto out_free;
        }
  
-       ret = dev->hid_get_raw_report(dev, report_number, buf, count, report_type);
+       ret = hid_hw_raw_request(dev, report_number, buf, count, report_type,
+                                HID_REQ_GET_REPORT);
  
        if (ret < 0)
                goto out_free;
@@@ -320,13 -331,13 +331,13 @@@ static void drop_ref(struct hidraw *hid
                        hid_hw_close(hidraw->hid);
                        wake_up_interruptible(&hidraw->wait);
                }
 +              device_destroy(hidraw_class,
 +                             MKDEV(hidraw_major, hidraw->minor));
        } else {
                --hidraw->open;
        }
        if (!hidraw->open) {
                if (!hidraw->exist) {
 -                      device_destroy(hidraw_class,
 -                                      MKDEV(hidraw_major, hidraw->minor));
                        hidraw_table[hidraw->minor] = NULL;
                        kfree(hidraw);
                } else {
index c121990c6beb0f90afac972187a6c881a5ffec83,2de2b8e224623e4d16342f8cc8b7b9a5dfe12786..8c52a07d56526ed6b3c16c67640174d52fda8391
@@@ -25,7 -25,6 +25,7 @@@
  #include <linux/delay.h>
  #include <linux/slab.h>
  #include <linux/pm.h>
 +#include <linux/pm_runtime.h>
  #include <linux/device.h>
  #include <linux/wait.h>
  #include <linux/err.h>
@@@ -257,18 -256,27 +257,27 @@@ static int i2c_hid_get_report(struct i2
        return 0;
  }
  
- static int i2c_hid_set_report(struct i2c_client *client, u8 reportType,
-               u8 reportID, unsigned char *buf, size_t data_len)
+ /**
+  * i2c_hid_set_or_send_report: forward an incoming report to the device
+  * @client: the i2c_client of the device
+  * @reportType: 0x03 for HID_FEATURE_REPORT ; 0x02 for HID_OUTPUT_REPORT
+  * @reportID: the report ID
+  * @buf: the actual data to transfer, without the report ID
+  * @len: size of buf
+  * @use_data: true: use SET_REPORT HID command, false: send plain OUTPUT report
+  */
+ static int i2c_hid_set_or_send_report(struct i2c_client *client, u8 reportType,
+               u8 reportID, unsigned char *buf, size_t data_len, bool use_data)
  {
        struct i2c_hid *ihid = i2c_get_clientdata(client);
        u8 *args = ihid->argsbuf;
-       const struct i2c_hid_cmd * hidcmd = &hid_set_report_cmd;
+       const struct i2c_hid_cmd *hidcmd;
        int ret;
        u16 dataRegister = le16_to_cpu(ihid->hdesc.wDataRegister);
        u16 outputRegister = le16_to_cpu(ihid->hdesc.wOutputRegister);
        u16 maxOutputLength = le16_to_cpu(ihid->hdesc.wMaxOutputLength);
  
-       /* hidraw already checked that data_len < HID_MAX_BUFFER_SIZE */
+       /* hid_hw_* already checked that data_len < HID_MAX_BUFFER_SIZE */
        u16 size =      2                       /* size */ +
                        (reportID ? 1 : 0)      /* reportID */ +
                        data_len                /* buf */;
  
        i2c_hid_dbg(ihid, "%s\n", __func__);
  
+       if (!use_data && maxOutputLength == 0)
+               return -ENOSYS;
        if (reportID >= 0x0F) {
                args[index++] = reportID;
                reportID = 0x0F;
         * use the data register for feature reports or if the device does not
         * support the output register
         */
-       if (reportType == 0x03 || maxOutputLength == 0) {
+       if (use_data) {
                args[index++] = dataRegister & 0xFF;
                args[index++] = dataRegister >> 8;
+               hidcmd = &hid_set_report_cmd;
        } else {
                args[index++] = outputRegister & 0xFF;
                args[index++] = outputRegister >> 8;
@@@ -455,18 -467,10 +468,18 @@@ static void i2c_hid_init_reports(struc
                return;
        }
  
 +      /*
 +       * The device must be powered on while we fetch initial reports
 +       * from it.
 +       */
 +      pm_runtime_get_sync(&client->dev);
 +
        list_for_each_entry(report,
                &hid->report_enum[HID_FEATURE_REPORT].report_list, list)
                i2c_hid_init_report(report, inbuf, ihid->bufsize);
  
 +      pm_runtime_put(&client->dev);
 +
        kfree(inbuf);
  }
  
@@@ -559,7 -563,7 +572,7 @@@ static int i2c_hid_get_raw_report(struc
  }
  
  static int i2c_hid_output_raw_report(struct hid_device *hid, __u8 *buf,
-               size_t count, unsigned char report_type)
+               size_t count, unsigned char report_type, bool use_data)
  {
        struct i2c_client *client = hid->driver_data;
        int report_id = buf[0];
                count--;
        }
  
-       ret = i2c_hid_set_report(client,
+       ret = i2c_hid_set_or_send_report(client,
                                report_type == HID_FEATURE_REPORT ? 0x03 : 0x02,
-                               report_id, buf, count);
+                               report_id, buf, count, use_data);
  
        if (report_id && ret >= 0)
                ret++; /* add report_id to the number of transfered bytes */
        return ret;
  }
  
- static void i2c_hid_request(struct hid_device *hid, struct hid_report *rep,
-               int reqtype)
+ static int i2c_hid_output_report(struct hid_device *hid, __u8 *buf,
+               size_t count)
  {
-       struct i2c_client *client = hid->driver_data;
-       char *buf;
-       int ret;
-       int len = i2c_hid_get_report_length(rep) - 2;
-       buf = hid_alloc_report_buf(rep, GFP_KERNEL);
-       if (!buf)
-               return;
+       return i2c_hid_output_raw_report(hid, buf, count, HID_OUTPUT_REPORT,
+                       false);
+ }
  
+ static int i2c_hid_raw_request(struct hid_device *hid, unsigned char reportnum,
+                              __u8 *buf, size_t len, unsigned char rtype,
+                              int reqtype)
+ {
        switch (reqtype) {
        case HID_REQ_GET_REPORT:
-               ret = i2c_hid_get_raw_report(hid, rep->id, buf, len, rep->type);
-               if (ret < 0)
-                       dev_err(&client->dev, "%s: unable to get report: %d\n",
-                               __func__, ret);
-               else
-                       hid_input_report(hid, rep->type, buf, ret, 0);
-               break;
+               return i2c_hid_get_raw_report(hid, reportnum, buf, len, rtype);
        case HID_REQ_SET_REPORT:
-               hid_output_report(rep, buf);
-               i2c_hid_output_raw_report(hid, buf, len, rep->type);
-               break;
+               if (buf[0] != reportnum)
+                       return -EINVAL;
+               return i2c_hid_output_raw_report(hid, buf, len, rtype, true);
+       default:
+               return -EIO;
        }
-       kfree(buf);
  }
  
  static int i2c_hid_parse(struct hid_device *hid)
@@@ -712,8 -709,8 +718,8 @@@ static int i2c_hid_open(struct hid_devi
  
        mutex_lock(&i2c_hid_open_mut);
        if (!hid->open++) {
 -              ret = i2c_hid_set_power(client, I2C_HID_PWR_ON);
 -              if (ret) {
 +              ret = pm_runtime_get_sync(&client->dev);
 +              if (ret < 0) {
                        hid->open--;
                        goto done;
                }
        }
  done:
        mutex_unlock(&i2c_hid_open_mut);
 -      return ret;
 +      return ret < 0 ? ret : 0;
  }
  
  static void i2c_hid_close(struct hid_device *hid)
                clear_bit(I2C_HID_STARTED, &ihid->flags);
  
                /* Save some power */
 -              i2c_hid_set_power(client, I2C_HID_PWR_SLEEP);
 +              pm_runtime_put(&client->dev);
        }
        mutex_unlock(&i2c_hid_open_mut);
  }
@@@ -747,18 -744,19 +753,18 @@@ static int i2c_hid_power(struct hid_dev
  {
        struct i2c_client *client = hid->driver_data;
        struct i2c_hid *ihid = i2c_get_clientdata(client);
 -      int ret = 0;
  
        i2c_hid_dbg(ihid, "%s lvl:%d\n", __func__, lvl);
  
        switch (lvl) {
        case PM_HINT_FULLON:
 -              ret = i2c_hid_set_power(client, I2C_HID_PWR_ON);
 +              pm_runtime_get_sync(&client->dev);
                break;
        case PM_HINT_NORMAL:
 -              ret = i2c_hid_set_power(client, I2C_HID_PWR_SLEEP);
 +              pm_runtime_put(&client->dev);
                break;
        }
 -      return ret;
 +      return 0;
  }
  
  static struct hid_ll_driver i2c_hid_ll_driver = {
        .open = i2c_hid_open,
        .close = i2c_hid_close,
        .power = i2c_hid_power,
-       .request = i2c_hid_request,
+       .output_report = i2c_hid_output_report,
+       .raw_request = i2c_hid_raw_request,
  };
  
  static int i2c_hid_init_irq(struct i2c_client *client)
@@@ -995,17 -994,13 +1002,17 @@@ static int i2c_hid_probe(struct i2c_cli
        if (ret < 0)
                goto err;
  
 +      pm_runtime_get_noresume(&client->dev);
 +      pm_runtime_set_active(&client->dev);
 +      pm_runtime_enable(&client->dev);
 +
        ret = i2c_hid_fetch_hid_descriptor(ihid);
        if (ret < 0)
 -              goto err;
 +              goto err_pm;
  
        ret = i2c_hid_init_irq(client);
        if (ret < 0)
 -              goto err;
 +              goto err_pm;
  
        hid = hid_allocate_device();
        if (IS_ERR(hid)) {
  
        hid->driver_data = client;
        hid->ll_driver = &i2c_hid_ll_driver;
-       hid->hid_get_raw_report = i2c_hid_get_raw_report;
-       hid->hid_output_raw_report = i2c_hid_output_raw_report;
        hid->dev.parent = &client->dev;
        ACPI_COMPANION_SET(&hid->dev, ACPI_COMPANION(&client->dev));
        hid->bus = BUS_I2C;
                goto err_mem_free;
        }
  
 +      pm_runtime_put(&client->dev);
        return 0;
  
  err_mem_free:
  err_irq:
        free_irq(client->irq, ihid);
  
 +err_pm:
 +      pm_runtime_put_noidle(&client->dev);
 +      pm_runtime_disable(&client->dev);
 +
  err:
        i2c_hid_free_buffers(ihid);
        kfree(ihid);
@@@ -1060,11 -1048,6 +1065,11 @@@ static int i2c_hid_remove(struct i2c_cl
        struct i2c_hid *ihid = i2c_get_clientdata(client);
        struct hid_device *hid;
  
 +      pm_runtime_get_sync(&client->dev);
 +      pm_runtime_disable(&client->dev);
 +      pm_runtime_set_suspended(&client->dev);
 +      pm_runtime_put_noidle(&client->dev);
 +
        hid = ihid->hid;
        hid_destroy_device(hid);
  
@@@ -1110,31 -1093,7 +1115,31 @@@ static int i2c_hid_resume(struct devic
  }
  #endif
  
 -static SIMPLE_DEV_PM_OPS(i2c_hid_pm, i2c_hid_suspend, i2c_hid_resume);
 +#ifdef CONFIG_PM_RUNTIME
 +static int i2c_hid_runtime_suspend(struct device *dev)
 +{
 +      struct i2c_client *client = to_i2c_client(dev);
 +
 +      i2c_hid_set_power(client, I2C_HID_PWR_SLEEP);
 +      disable_irq(client->irq);
 +      return 0;
 +}
 +
 +static int i2c_hid_runtime_resume(struct device *dev)
 +{
 +      struct i2c_client *client = to_i2c_client(dev);
 +
 +      enable_irq(client->irq);
 +      i2c_hid_set_power(client, I2C_HID_PWR_ON);
 +      return 0;
 +}
 +#endif
 +
 +static const struct dev_pm_ops i2c_hid_pm = {
 +      SET_SYSTEM_SLEEP_PM_OPS(i2c_hid_suspend, i2c_hid_resume)
 +      SET_RUNTIME_PM_OPS(i2c_hid_runtime_suspend, i2c_hid_runtime_resume,
 +                         NULL)
 +};
  
  static const struct i2c_device_id i2c_hid_id_table[] = {
        { "hid", 0 },
index 450a0b999614f980f3440f607b4f0af018c3e0a1,514ddb5aef9678bbf4ab0ffd84edc78019fc918b..8181ea4bc2f236f3755e515782bb7cff2b86ff6f
@@@ -223,51 -223,6 +223,6 @@@ static void hidp_input_report(struct hi
        input_sync(dev);
  }
  
- static int hidp_send_report(struct hidp_session *session, struct hid_report *report)
- {
-       unsigned char hdr;
-       u8 *buf;
-       int rsize, ret;
-       buf = hid_alloc_report_buf(report, GFP_ATOMIC);
-       if (!buf)
-               return -EIO;
-       hid_output_report(report, buf);
-       hdr = HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT;
-       rsize = ((report->size - 1) >> 3) + 1 + (report->id > 0);
-       ret = hidp_send_intr_message(session, hdr, buf, rsize);
-       kfree(buf);
-       return ret;
- }
- static int hidp_hidinput_event(struct input_dev *dev, unsigned int type,
-                              unsigned int code, int value)
- {
-       struct hid_device *hid = input_get_drvdata(dev);
-       struct hidp_session *session = hid->driver_data;
-       struct hid_field *field;
-       int offset;
-       BT_DBG("session %p type %d code %d value %d",
-              session, type, code, value);
-       if (type != EV_LED)
-               return -1;
-       offset = hidinput_find_field(hid, type, code, &field);
-       if (offset == -1) {
-               hid_warn(dev, "event field not found\n");
-               return -1;
-       }
-       hid_set_field(field, offset, value);
-       return hidp_send_report(session, field->report);
- }
  static int hidp_get_raw_report(struct hid_device *hid,
                unsigned char report_number,
                unsigned char *data, size_t count,
@@@ -418,62 -373,13 +373,13 @@@ err
        return ret;
  }
  
- static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count,
-               unsigned char report_type)
+ static int hidp_output_report(struct hid_device *hid, __u8 *data, size_t count)
  {
        struct hidp_session *session = hid->driver_data;
-       int ret;
-       if (report_type == HID_OUTPUT_REPORT) {
-               report_type = HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT;
-               return hidp_send_intr_message(session, report_type,
-                                             data, count);
-       } else if (report_type != HID_FEATURE_REPORT) {
-               return -EINVAL;
-       }
-       if (mutex_lock_interruptible(&session->report_mutex))
-               return -ERESTARTSYS;
-       /* Set up our wait, and send the report request to the device. */
-       set_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags);
-       report_type = HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE;
-       ret = hidp_send_ctrl_message(session, report_type, data, count);
-       if (ret)
-               goto err;
-       /* Wait for the ACK from the device. */
-       while (test_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags) &&
-              !atomic_read(&session->terminate)) {
-               int res;
-               res = wait_event_interruptible_timeout(session->report_queue,
-                       !test_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags)
-                               || atomic_read(&session->terminate),
-                       10*HZ);
-               if (res == 0) {
-                       /* timeout */
-                       ret = -EIO;
-                       goto err;
-               }
-               if (res < 0) {
-                       /* signal */
-                       ret = -ERESTARTSYS;
-                       goto err;
-               }
-       }
  
-       if (!session->output_report_success) {
-               ret = -EIO;
-               goto err;
-       }
-       ret = count;
- err:
-       clear_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags);
-       mutex_unlock(&session->report_mutex);
-       return ret;
+       return hidp_send_intr_message(session,
+                                     HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT,
+                                     data, count);
  }
  
  static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum,
        }
  }
  
- static int hidp_output_report(struct hid_device *hid, __u8 *data, size_t count)
- {
-       struct hidp_session *session = hid->driver_data;
-       return hidp_send_intr_message(session,
-                                     HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT,
-                                     data, count);
- }
  static void hidp_idle_timeout(unsigned long arg)
  {
        struct hidp_session *session = (struct hidp_session *) arg;
@@@ -518,16 -415,6 +415,16 @@@ static void hidp_del_timer(struct hidp_
                del_timer(&session->timer);
  }
  
 +static void hidp_process_report(struct hidp_session *session,
 +                              int type, const u8 *data, int len, int intr)
 +{
 +      if (len > HID_MAX_BUFFER_SIZE)
 +              len = HID_MAX_BUFFER_SIZE;
 +
 +      memcpy(session->input_buf, data, len);
 +      hid_input_report(session->hid, type, session->input_buf, len, intr);
 +}
 +
  static void hidp_process_handshake(struct hidp_session *session,
                                        unsigned char param)
  {
@@@ -600,8 -487,7 +497,8 @@@ static int hidp_process_data(struct hid
                        hidp_input_report(session, skb);
  
                if (session->hid)
 -                      hid_input_report(session->hid, HID_INPUT_REPORT, skb->data, skb->len, 0);
 +                      hidp_process_report(session, HID_INPUT_REPORT,
 +                                          skb->data, skb->len, 0);
                break;
  
        case HIDP_DATA_RTYPE_OTHER:
@@@ -683,8 -569,7 +580,8 @@@ static void hidp_recv_intr_frame(struc
                        hidp_input_report(session, skb);
  
                if (session->hid) {
 -                      hid_input_report(session->hid, HID_INPUT_REPORT, skb->data, skb->len, 1);
 +                      hidp_process_report(session, HID_INPUT_REPORT,
 +                                          skb->data, skb->len, 1);
                        BT_DBG("report len %d", skb->len);
                }
        } else {
@@@ -829,7 -714,6 +726,6 @@@ static struct hid_ll_driver hidp_hid_dr
        .close = hidp_close,
        .raw_request = hidp_raw_request,
        .output_report = hidp_output_report,
-       .hidinput_input_event = hidp_hidinput_event,
  };
  
  /* This function sets up the hid device. It does not add it
@@@ -871,15 -755,15 +767,15 @@@ static int hidp_setup_hid(struct hidp_s
        snprintf(hid->phys, sizeof(hid->phys), "%pMR",
                 &l2cap_pi(session->ctrl_sock->sk)->chan->src);
  
+       /* NOTE: Some device modules depend on the dst address being stored in
+        * uniq. Please be aware of this before making changes to this behavior.
+        */
        snprintf(hid->uniq, sizeof(hid->uniq), "%pMR",
                 &l2cap_pi(session->ctrl_sock->sk)->chan->dst);
  
        hid->dev.parent = &session->conn->hcon->dev;
        hid->ll_driver = &hidp_hid_driver;
  
-       hid->hid_get_raw_report = hidp_get_raw_report;
-       hid->hid_output_raw_report = hidp_output_raw_report;
        /* True if device is blacklisted in drivers/hid/hid-core.c */
        if (hid_ignore(hid)) {
                hid_destroy_device(session->hid);