]> Pileus Git - ~andy/linux/blobdiff - drivers/hid/hid-sony.c
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[~andy/linux] / drivers / hid / hid-sony.c
index 098af2f84b8c653dca9542d78de33c5c5777fe8b..2f19b15f47f2ffca68de731ef0e0ba3ae53c972b 100644 (file)
 
 #include "hid-ids.h"
 
-#define VAIO_RDESC_CONSTANT     (1 << 0)
-#define SIXAXIS_CONTROLLER_USB  (1 << 1)
-#define SIXAXIS_CONTROLLER_BT   (1 << 2)
-#define BUZZ_CONTROLLER         (1 << 3)
-#define PS3REMOTE              (1 << 4)
+#define VAIO_RDESC_CONSTANT       BIT(0)
+#define SIXAXIS_CONTROLLER_USB    BIT(1)
+#define SIXAXIS_CONTROLLER_BT     BIT(2)
+#define BUZZ_CONTROLLER           BIT(3)
+#define PS3REMOTE                 BIT(4)
+#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 MAX_LEDS 4
 
 static const u8 sixaxis_rdesc_fixup[] = {
        0x95, 0x13, 0x09, 0x01, 0x81, 0x02, 0x95, 0x0C,
@@ -67,6 +74,265 @@ static const u8 sixaxis_rdesc_fixup2[] = {
        0xb1, 0x02, 0xc0, 0xc0,
 };
 
+/* 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.
+ */
+static u8 dualshock4_usb_rdesc[] = {
+       0x05, 0x01,         /*  Usage Page (Desktop),               */
+       0x09, 0x05,         /*  Usage (Gamepad),                    */
+       0xA1, 0x01,         /*  Collection (Application),           */
+       0x85, 0x01,         /*      Report ID (1),                  */
+       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),            */
+       0x35, 0x00,         /*      Physical Minimum (0),           */
+       0x46, 0x3B, 0x01,   /*      Physical Maximum (315),         */
+       0x65, 0x14,         /*      Unit (Degrees),                 */
+       0x75, 0x04,         /*      Report Size (4),                */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0x81, 0x42,         /*      Input (Variable, Null State),   */
+       0x65, 0x00,         /*      Unit,                           */
+       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),               */
+       0x06, 0x00, 0xFF,   /*      Usage Page (FF00h),             */
+       0x09, 0x20,         /*      Usage (20h),                    */
+       0x75, 0x06,         /*      Report Size (6),                */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0x15, 0x00,         /*      Logical Minimum (0),            */
+       0x25, 0x7F,         /*      Logical Maximum (127),          */
+       0x81, 0x02,         /*      Input (Variable),               */
+       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, 0x21,         /*      Usage (21h),                    */
+       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, 0x21,         /*      Usage (21h),                    */
+       0x15, 0x00,         /*      Logical Minimum (0),            */
+       0x25, 0xFF,         /*      Logical Maximum (255),          */
+       0x75, 0x08,         /*      Report Size (8),                */
+       0x95, 0x27,         /*      Report Count (39),              */
+       0x81, 0x02,         /*      Input (Variable),               */
+       0x85, 0x05,         /*      Report ID (5),                  */
+       0x09, 0x22,         /*      Usage (22h),                    */
+       0x95, 0x1F,         /*      Report Count (31),              */
+       0x91, 0x02,         /*      Output (Variable),              */
+       0x85, 0x04,         /*      Report ID (4),                  */
+       0x09, 0x23,         /*      Usage (23h),                    */
+       0x95, 0x24,         /*      Report Count (36),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x02,         /*      Report ID (2),                  */
+       0x09, 0x24,         /*      Usage (24h),                    */
+       0x95, 0x24,         /*      Report Count (36),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x08,         /*      Report ID (8),                  */
+       0x09, 0x25,         /*      Usage (25h),                    */
+       0x95, 0x03,         /*      Report Count (3),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x10,         /*      Report ID (16),                 */
+       0x09, 0x26,         /*      Usage (26h),                    */
+       0x95, 0x04,         /*      Report Count (4),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x11,         /*      Report ID (17),                 */
+       0x09, 0x27,         /*      Usage (27h),                    */
+       0x95, 0x02,         /*      Report Count (2),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x12,         /*      Report ID (18),                 */
+       0x06, 0x02, 0xFF,   /*      Usage Page (FF02h),             */
+       0x09, 0x21,         /*      Usage (21h),                    */
+       0x95, 0x0F,         /*      Report Count (15),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x13,         /*      Report ID (19),                 */
+       0x09, 0x22,         /*      Usage (22h),                    */
+       0x95, 0x16,         /*      Report Count (22),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x14,         /*      Report ID (20),                 */
+       0x06, 0x05, 0xFF,   /*      Usage Page (FF05h),             */
+       0x09, 0x20,         /*      Usage (20h),                    */
+       0x95, 0x10,         /*      Report Count (16),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x15,         /*      Report ID (21),                 */
+       0x09, 0x21,         /*      Usage (21h),                    */
+       0x95, 0x2C,         /*      Report Count (44),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x06, 0x80, 0xFF,   /*      Usage Page (FF80h),             */
+       0x85, 0x80,         /*      Report ID (128),                */
+       0x09, 0x20,         /*      Usage (20h),                    */
+       0x95, 0x06,         /*      Report Count (6),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x81,         /*      Report ID (129),                */
+       0x09, 0x21,         /*      Usage (21h),                    */
+       0x95, 0x06,         /*      Report Count (6),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x82,         /*      Report ID (130),                */
+       0x09, 0x22,         /*      Usage (22h),                    */
+       0x95, 0x05,         /*      Report Count (5),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x83,         /*      Report ID (131),                */
+       0x09, 0x23,         /*      Usage (23h),                    */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x84,         /*      Report ID (132),                */
+       0x09, 0x24,         /*      Usage (24h),                    */
+       0x95, 0x04,         /*      Report Count (4),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x85,         /*      Report ID (133),                */
+       0x09, 0x25,         /*      Usage (25h),                    */
+       0x95, 0x06,         /*      Report Count (6),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x86,         /*      Report ID (134),                */
+       0x09, 0x26,         /*      Usage (26h),                    */
+       0x95, 0x06,         /*      Report Count (6),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x87,         /*      Report ID (135),                */
+       0x09, 0x27,         /*      Usage (27h),                    */
+       0x95, 0x23,         /*      Report Count (35),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x88,         /*      Report ID (136),                */
+       0x09, 0x28,         /*      Usage (28h),                    */
+       0x95, 0x22,         /*      Report Count (34),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x89,         /*      Report ID (137),                */
+       0x09, 0x29,         /*      Usage (29h),                    */
+       0x95, 0x02,         /*      Report Count (2),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x90,         /*      Report ID (144),                */
+       0x09, 0x30,         /*      Usage (30h),                    */
+       0x95, 0x05,         /*      Report Count (5),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x91,         /*      Report ID (145),                */
+       0x09, 0x31,         /*      Usage (31h),                    */
+       0x95, 0x03,         /*      Report Count (3),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x92,         /*      Report ID (146),                */
+       0x09, 0x32,         /*      Usage (32h),                    */
+       0x95, 0x03,         /*      Report Count (3),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0x93,         /*      Report ID (147),                */
+       0x09, 0x33,         /*      Usage (33h),                    */
+       0x95, 0x0C,         /*      Report Count (12),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA0,         /*      Report ID (160),                */
+       0x09, 0x40,         /*      Usage (40h),                    */
+       0x95, 0x06,         /*      Report Count (6),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA1,         /*      Report ID (161),                */
+       0x09, 0x41,         /*      Usage (41h),                    */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA2,         /*      Report ID (162),                */
+       0x09, 0x42,         /*      Usage (42h),                    */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA3,         /*      Report ID (163),                */
+       0x09, 0x43,         /*      Usage (43h),                    */
+       0x95, 0x30,         /*      Report Count (48),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA4,         /*      Report ID (164),                */
+       0x09, 0x44,         /*      Usage (44h),                    */
+       0x95, 0x0D,         /*      Report Count (13),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA5,         /*      Report ID (165),                */
+       0x09, 0x45,         /*      Usage (45h),                    */
+       0x95, 0x15,         /*      Report Count (21),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA6,         /*      Report ID (166),                */
+       0x09, 0x46,         /*      Usage (46h),                    */
+       0x95, 0x15,         /*      Report Count (21),              */
+       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, 0xA7,         /*      Report ID (167),                */
+       0x09, 0x4A,         /*      Usage (4Ah),                    */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA8,         /*      Report ID (168),                */
+       0x09, 0x4B,         /*      Usage (4Bh),                    */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xA9,         /*      Report ID (169),                */
+       0x09, 0x4C,         /*      Usage (4Ch),                    */
+       0x95, 0x08,         /*      Report Count (8),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xAA,         /*      Report ID (170),                */
+       0x09, 0x4E,         /*      Usage (4Eh),                    */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xAB,         /*      Report ID (171),                */
+       0x09, 0x4F,         /*      Usage (4Fh),                    */
+       0x95, 0x39,         /*      Report Count (57),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xAC,         /*      Report ID (172),                */
+       0x09, 0x50,         /*      Usage (50h),                    */
+       0x95, 0x39,         /*      Report Count (57),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xAD,         /*      Report ID (173),                */
+       0x09, 0x51,         /*      Usage (51h),                    */
+       0x95, 0x0B,         /*      Report Count (11),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xAE,         /*      Report ID (174),                */
+       0x09, 0x52,         /*      Usage (52h),                    */
+       0x95, 0x01,         /*      Report Count (1),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xAF,         /*      Report ID (175),                */
+       0x09, 0x53,         /*      Usage (53h),                    */
+       0x95, 0x02,         /*      Report Count (2),               */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0x85, 0xB0,         /*      Report ID (176),                */
+       0x09, 0x54,         /*      Usage (54h),                    */
+       0x95, 0x3F,         /*      Report Count (63),              */
+       0xB1, 0x02,         /*      Feature (Variable),             */
+       0xC0                /*  End Collection                      */
+};
+
 static __u8 ps3remote_rdesc[] = {
        0x05, 0x01,          /* GUsagePage Generic Desktop */
        0x09, 0x05,          /* LUsage 0x05 [Game Pad] */
@@ -223,21 +489,20 @@ static const unsigned int buzz_keymap[] = {
 };
 
 struct sony_sc {
+       struct hid_device *hdev;
+       struct led_classdev *leds[MAX_LEDS];
+       struct hid_report *output_report;
        unsigned long quirks;
+       struct work_struct state_worker;
 
 #ifdef CONFIG_SONY_FF
-       struct work_struct rumble_worker;
-       struct hid_device *hdev;
        __u8 left;
        __u8 right;
 #endif
 
-       void *extra;
-};
-
-struct buzz_extra {
-       int led_state;
-       struct led_classdev *leds[4];
+       __u8 worker_initialized;
+       __u8 led_state[MAX_LEDS];
+       __u8 led_count;
 };
 
 static __u8 *ps3remote_fixup(struct hid_device *hdev, __u8 *rdesc,
@@ -304,6 +569,17 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                rdesc[55] = 0x06;
        }
 
+       /*
+        * The default Dualshock 4 USB descriptor doesn't assign
+        * the gyroscope values to corresponding axes so we need a
+        * modified one.
+        */
+       if ((sc->quirks & DUALSHOCK4_CONTROLLER_USB) && *rsize == 467) {
+               hid_info(hdev, "Using modified Dualshock 4 report descriptor with gyroscope axes\n");
+               rdesc = dualshock4_usb_rdesc;
+               *rsize = sizeof(dualshock4_usb_rdesc);
+       }
+
        /* The HID descriptor exposed over BT has a trailing zero byte */
        if ((((sc->quirks & SIXAXIS_CONTROLLER_USB) && *rsize == 148) ||
                        ((sc->quirks & SIXAXIS_CONTROLLER_BT) && *rsize == 149)) &&
@@ -448,7 +724,7 @@ static int sixaxis_set_operational_bt(struct hid_device *hdev)
        return hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT);
 }
 
-static void buzz_set_leds(struct hid_device *hdev, int leds)
+static void buzz_set_leds(struct hid_device *hdev, const __u8 *leds)
 {
        struct list_head *report_list =
                &hdev->report_enum[HID_OUTPUT_REPORT].report_list;
@@ -457,67 +733,76 @@ static void buzz_set_leds(struct hid_device *hdev, int leds)
        __s32 *value = report->field[0]->value;
 
        value[0] = 0x00;
-       value[1] = (leds & 1) ? 0xff : 0x00;
-       value[2] = (leds & 2) ? 0xff : 0x00;
-       value[3] = (leds & 4) ? 0xff : 0x00;
-       value[4] = (leds & 8) ? 0xff : 0x00;
+       value[1] = leds[0] ? 0xff : 0x00;
+       value[2] = leds[1] ? 0xff : 0x00;
+       value[3] = leds[2] ? 0xff : 0x00;
+       value[4] = leds[3] ? 0xff : 0x00;
        value[5] = 0x00;
        value[6] = 0x00;
        hid_hw_request(hdev, report, HID_REQ_SET_REPORT);
 }
 
-static void buzz_led_set_brightness(struct led_classdev *led,
+static void sony_set_leds(struct hid_device *hdev, const __u8 *leds, int count)
+{
+       struct sony_sc *drv_data = hid_get_drvdata(hdev);
+       int n;
+
+       BUG_ON(count > MAX_LEDS);
+
+       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)) {
+               for (n = 0; n < count; n++)
+                       drv_data->led_state[n] = leds[n];
+               schedule_work(&drv_data->state_worker);
+       }
+}
+
+static void sony_led_set_brightness(struct led_classdev *led,
                                    enum led_brightness value)
 {
        struct device *dev = led->dev->parent;
        struct hid_device *hdev = container_of(dev, struct hid_device, dev);
        struct sony_sc *drv_data;
-       struct buzz_extra *buzz;
 
        int n;
 
        drv_data = hid_get_drvdata(hdev);
-       if (!drv_data || !drv_data->extra) {
+       if (!drv_data) {
                hid_err(hdev, "No device data\n");
                return;
        }
-       buzz = drv_data->extra;
-
-       for (n = 0; n < 4; n++) {
-               if (led == buzz->leds[n]) {
-                       int on = !! (buzz->led_state & (1 << n));
-                       if (value == LED_OFF && on) {
-                               buzz->led_state &= ~(1 << n);
-                               buzz_set_leds(hdev, buzz->led_state);
-                       } else if (value != LED_OFF && !on) {
-                               buzz->led_state |= (1 << n);
-                               buzz_set_leds(hdev, buzz->led_state);
+
+       for (n = 0; n < drv_data->led_count; n++) {
+               if (led == drv_data->leds[n]) {
+                       if (value != drv_data->led_state[n]) {
+                               drv_data->led_state[n] = value;
+                               sony_set_leds(hdev, drv_data->led_state, drv_data->led_count);
                        }
                        break;
                }
        }
 }
 
-static enum led_brightness buzz_led_get_brightness(struct led_classdev *led)
+static enum led_brightness sony_led_get_brightness(struct led_classdev *led)
 {
        struct device *dev = led->dev->parent;
        struct hid_device *hdev = container_of(dev, struct hid_device, dev);
        struct sony_sc *drv_data;
-       struct buzz_extra *buzz;
 
        int n;
        int on = 0;
 
        drv_data = hid_get_drvdata(hdev);
-       if (!drv_data || !drv_data->extra) {
+       if (!drv_data) {
                hid_err(hdev, "No device data\n");
                return LED_OFF;
        }
-       buzz = drv_data->extra;
 
-       for (n = 0; n < 4; n++) {
-               if (led == buzz->leds[n]) {
-                       on = !! (buzz->led_state & (1 << n));
+       for (n = 0; n < drv_data->led_count; n++) {
+               if (led == drv_data->leds[n]) {
+                       on = !!(drv_data->led_state[n]);
                        break;
                }
        }
@@ -525,110 +810,122 @@ static enum led_brightness buzz_led_get_brightness(struct led_classdev *led)
        return on ? LED_FULL : LED_OFF;
 }
 
-static int buzz_init(struct hid_device *hdev)
+static void sony_leds_remove(struct hid_device *hdev)
+{
+       struct sony_sc *drv_data;
+       struct led_classdev *led;
+       int n;
+
+       drv_data = hid_get_drvdata(hdev);
+       BUG_ON(!(drv_data->quirks & SONY_LED_SUPPORT));
+
+       for (n = 0; n < drv_data->led_count; n++) {
+               led = drv_data->leds[n];
+               drv_data->leds[n] = NULL;
+               if (!led)
+                       continue;
+               led_classdev_unregister(led);
+               kfree(led);
+       }
+
+       drv_data->led_count = 0;
+}
+
+static int sony_leds_init(struct hid_device *hdev)
 {
        struct sony_sc *drv_data;
-       struct buzz_extra *buzz;
        int n, ret = 0;
+       int max_brightness;
+       int use_colors;
        struct led_classdev *led;
        size_t name_sz;
        char *name;
+       size_t name_len;
+       const char *name_fmt;
+       static const char * const color_str[] = { "red", "green", "blue" };
+       static const __u8 initial_values[MAX_LEDS] = { 0x00, 0x00, 0x00, 0x00 };
 
        drv_data = hid_get_drvdata(hdev);
-       BUG_ON(!(drv_data->quirks & BUZZ_CONTROLLER));
-
-       /* Validate expected report characteristics. */
-       if (!hid_validate_values(hdev, HID_OUTPUT_REPORT, 0, 0, 7))
-               return -ENODEV;
-
-       buzz = kzalloc(sizeof(*buzz), GFP_KERNEL);
-       if (!buzz) {
-               hid_err(hdev, "Insufficient memory, cannot allocate driver data\n");
-               return -ENOMEM;
+       BUG_ON(!(drv_data->quirks & SONY_LED_SUPPORT));
+
+       if (drv_data->quirks & BUZZ_CONTROLLER) {
+               drv_data->led_count = 4;
+               max_brightness = 1;
+               use_colors = 0;
+               name_len = strlen("::buzz#");
+               name_fmt = "%s::buzz%d";
+               /* 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) {
+               drv_data->led_count = 3;
+               max_brightness = 255;
+               use_colors = 1;
+               name_len = 0;
+               name_fmt = "%s:%s";
+       } else {
+               drv_data->led_count = 4;
+               max_brightness = 1;
+               use_colors = 0;
+               name_len = strlen("::sony#");
+               name_fmt = "%s::sony%d";
        }
-       drv_data->extra = buzz;
 
        /* 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 */
-       buzz_set_leds(hdev, 0x00);
+       sony_set_leds(hdev, initial_values, drv_data->led_count);
 
-       name_sz = strlen(dev_name(&hdev->dev)) + strlen("::buzz#") + 1;
+       name_sz = strlen(dev_name(&hdev->dev)) + name_len + 1;
+
+       for (n = 0; n < drv_data->led_count; n++) {
+
+               if (use_colors)
+                       name_sz = strlen(dev_name(&hdev->dev)) + strlen(color_str[n]) + 2;
 
-       for (n = 0; n < 4; n++) {
                led = kzalloc(sizeof(struct led_classdev) + name_sz, GFP_KERNEL);
                if (!led) {
                        hid_err(hdev, "Couldn't allocate memory for LED %d\n", n);
+                       ret = -ENOMEM;
                        goto error_leds;
                }
 
                name = (void *)(&led[1]);
-               snprintf(name, name_sz, "%s::buzz%d", dev_name(&hdev->dev), n + 1);
+               if (use_colors)
+                       snprintf(name, name_sz, name_fmt, dev_name(&hdev->dev), color_str[n]);
+               else
+                       snprintf(name, name_sz, name_fmt, dev_name(&hdev->dev), n + 1);
                led->name = name;
                led->brightness = 0;
-               led->max_brightness = 1;
-               led->brightness_get = buzz_led_get_brightness;
-               led->brightness_set = buzz_led_set_brightness;
+               led->max_brightness = max_brightness;
+               led->brightness_get = sony_led_get_brightness;
+               led->brightness_set = sony_led_set_brightness;
 
-               if (led_classdev_register(&hdev->dev, led)) {
+               ret = led_classdev_register(&hdev->dev, led);
+               if (ret) {
                        hid_err(hdev, "Failed to register LED %d\n", n);
                        kfree(led);
                        goto error_leds;
                }
 
-               buzz->leds[n] = led;
+               drv_data->leds[n] = led;
        }
 
        return ret;
 
 error_leds:
-       for (n = 0; n < 4; n++) {
-               led = buzz->leds[n];
-               buzz->leds[n] = NULL;
-               if (!led)
-                       continue;
-               led_classdev_unregister(led);
-               kfree(led);
-       }
+       sony_leds_remove(hdev);
 
-       kfree(drv_data->extra);
-       drv_data->extra = NULL;
        return ret;
 }
 
-static void buzz_remove(struct hid_device *hdev)
-{
-       struct sony_sc *drv_data;
-       struct buzz_extra *buzz;
-       struct led_classdev *led;
-       int n;
-
-       drv_data = hid_get_drvdata(hdev);
-       BUG_ON(!(drv_data->quirks & BUZZ_CONTROLLER));
-
-       buzz = drv_data->extra;
-
-       for (n = 0; n < 4; n++) {
-               led = buzz->leds[n];
-               buzz->leds[n] = NULL;
-               if (!led)
-                       continue;
-               led_classdev_unregister(led);
-               kfree(led);
-       }
-
-       kfree(drv_data->extra);
-       drv_data->extra = NULL;
-}
-
-#ifdef CONFIG_SONY_FF
-static void sony_rumble_worker(struct work_struct *work)
+static void sixaxis_state_worker(struct work_struct *work)
 {
-       struct sony_sc *sc = container_of(work, struct sony_sc, rumble_worker);
+       struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
        unsigned char buf[] = {
                0x01,
                0x00, 0xff, 0x00, 0xff, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x03,
+               0x00, 0x00, 0x00, 0x00, 0x00,
                0xff, 0x27, 0x10, 0x00, 0x32,
                0xff, 0x27, 0x10, 0x00, 0x32,
                0xff, 0x27, 0x10, 0x00, 0x32,
@@ -636,13 +933,42 @@ static void sony_rumble_worker(struct work_struct *work)
                0x00, 0x00, 0x00, 0x00, 0x00
        };
 
-       buf[3] = sc->right;
+#ifdef CONFIG_SONY_FF
+       buf[3] = sc->right ? 1 : 0;
        buf[5] = sc->left;
+#endif
+
+       buf[10] |= sc->led_state[0] << 1;
+       buf[10] |= sc->led_state[1] << 2;
+       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);
 }
 
+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;
+
+       value[0] = 0x03;
+
+#ifdef CONFIG_SONY_FF
+       value[3] = sc->right;
+       value[4] = sc->left;
+#endif
+
+       value[5] = sc->led_state[0];
+       value[6] = sc->led_state[1];
+       value[7] = sc->led_state[2];
+
+       hid_hw_request(hdev, report, HID_REQ_SET_REPORT);
+}
+
+#ifdef CONFIG_SONY_FF
 static int sony_play_effect(struct input_dev *dev, void *data,
                            struct ff_effect *effect)
 {
@@ -653,9 +979,9 @@ static int sony_play_effect(struct input_dev *dev, void *data,
                return 0;
 
        sc->left = effect->u.rumble.strong_magnitude / 256;
-       sc->right = effect->u.rumble.weak_magnitude ? 1 : 0;
+       sc->right = effect->u.rumble.weak_magnitude / 256;
 
-       schedule_work(&sc->rumble_worker);
+       schedule_work(&sc->state_worker);
        return 0;
 }
 
@@ -664,32 +990,44 @@ static int sony_init_ff(struct hid_device *hdev)
        struct hid_input *hidinput = list_entry(hdev->inputs.next,
                                                struct hid_input, list);
        struct input_dev *input_dev = hidinput->input;
-       struct sony_sc *sc = hid_get_drvdata(hdev);
-
-       sc->hdev = hdev;
-       INIT_WORK(&sc->rumble_worker, sony_rumble_worker);
 
        input_set_capability(input_dev, EV_FF, FF_RUMBLE);
        return input_ff_create_memless(input_dev, NULL, sony_play_effect);
 }
 
-static void sony_destroy_ff(struct hid_device *hdev)
-{
-       struct sony_sc *sc = hid_get_drvdata(hdev);
-
-       cancel_work_sync(&sc->rumble_worker);
-}
-
 #else
 static int sony_init_ff(struct hid_device *hdev)
 {
        return 0;
 }
+#endif
 
-static void sony_destroy_ff(struct hid_device *hdev)
+static int sony_set_output_report(struct sony_sc *sc, int req_id, int req_size)
 {
+       struct list_head *head, *list;
+       struct hid_report *report;
+       struct hid_device *hdev = sc->hdev;
+
+       list = &hdev->report_enum[HID_OUTPUT_REPORT].report_list;
+
+       list_for_each(head, list) {
+               report = list_entry(head, struct hid_report, list);
+
+               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;
+               }
+       }
+
+       hid_err(hdev, "Unable to locate output report 0x%02x\n", req_id);
+
+       return -EINVAL;
 }
-#endif
 
 static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
@@ -706,6 +1044,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
        sc->quirks = quirks;
        hid_set_drvdata(hdev, sc);
+       sc->hdev = hdev;
 
        ret = hid_parse(hdev);
        if (ret) {
@@ -729,23 +1068,43 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
        if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
                hdev->hid_output_raw_report = sixaxis_usb_output_raw_report;
                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)
                ret = sixaxis_set_operational_bt(hdev);
-       else if (sc->quirks & BUZZ_CONTROLLER)
-               ret = buzz_init(hdev);
-       else
+       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);
+               if (ret < 0)
+                       goto err_stop;
+
+               sc->worker_initialized = 1;
+               INIT_WORK(&sc->state_worker, dualshock4_state_worker);
+       } else {
                ret = 0;
+       }
 
        if (ret < 0)
                goto err_stop;
 
-       ret = sony_init_ff(hdev);
-       if (ret < 0)
-               goto err_stop;
+       if (sc->quirks & SONY_LED_SUPPORT) {
+               ret = sony_leds_init(hdev);
+               if (ret < 0)
+                       goto err_stop;
+       }
+
+       if (sc->quirks & SONY_FF_SUPPORT) {
+               ret = sony_init_ff(hdev);
+               if (ret < 0)
+                       goto err_stop;
+       }
 
        return 0;
 err_stop:
+       if (sc->quirks & SONY_LED_SUPPORT)
+               sony_leds_remove(hdev);
        hid_hw_stop(hdev);
        return ret;
 }
@@ -754,10 +1113,11 @@ static void sony_remove(struct hid_device *hdev)
 {
        struct sony_sc *sc = hid_get_drvdata(hdev);
 
-       if (sc->quirks & BUZZ_CONTROLLER)
-               buzz_remove(hdev);
+       if (sc->quirks & SONY_LED_SUPPORT)
+               sony_leds_remove(hdev);
 
-       sony_destroy_ff(hdev);
+       if (sc->worker_initialized)
+               cancel_work_sync(&sc->state_worker);
 
        hid_hw_stop(hdev);
 }
@@ -785,6 +1145,11 @@ static const struct hid_device_id sony_devices[] = {
        /* Logitech Harmony Adapter for PS3 */
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3),
                .driver_data = PS3REMOTE },
+       /* Sony Dualshock 4 controllers for PS4 */
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
+               .driver_data = DUALSHOCK4_CONTROLLER_USB },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
+               .driver_data = DUALSHOCK4_CONTROLLER_BT },
        { }
 };
 MODULE_DEVICE_TABLE(hid, sony_devices);