11 files changed, 53 insertions, 39 deletions

diff --git a/Documentation/input/event-codes.txt b/Documentation/input/event-codes.txt
index 3f0f5ce3338b..36ea940e5bb9 100644
--- a/Documentation/input/event-codes.txt
+++ b/Documentation/input/event-codes.txt
@@ -173,6 +173,10 @@ A few EV_ABS codes have special meanings:
     proximity of the device and while the value of the BTN_TOUCH code is 0. If
     the input device may be used freely in three dimensions, consider ABS_Z
     instead.
+  - BTN_TOOL_<name> should be set to 1 when the tool comes into detectable
+    proximity and set to 0 when the tool leaves detectable proximity.
+    BTN_TOOL_<name> signals the type of tool that is currently detected by the
+    hardware and is otherwise independent of ABS_DISTANCE and/or BTN_TOUCH.
 
 * ABS_MT_<name>:
   - Used to describe multitouch input events. Please see
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index e8a84d12b7ff..1142a93dd90b 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -153,6 +153,7 @@ static const struct xpad_device {
         { 0x0738, 0x4728, "Mad Catz Street Fighter IV FightPad", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
         { 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
         { 0x0738, 0x4740, "Mad Catz Beat Pad", 0, XTYPE_XBOX360 },
+        { 0x0738, 0x4a01, "Mad Catz FightStick TE 2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE },
         { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
         { 0x0738, 0xb726, "Mad Catz Xbox controller - MW2", 0, XTYPE_XBOX360 },
         { 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad", XTYPE_XBOX360 },
@@ -304,6 +305,7 @@ static struct usb_device_id xpad_table[] = {
         XPAD_XBOX360_VENDOR(0x046d),            /* Logitech X-Box 360 style controllers */
         XPAD_XBOX360_VENDOR(0x0738),            /* Mad Catz X-Box 360 controllers */
         { USB_DEVICE(0x0738, 0x4540) },         /* Mad Catz Beat Pad */
+        XPAD_XBOXONE_VENDOR(0x0738),            /* Mad Catz FightStick TE 2 */
         XPAD_XBOX360_VENDOR(0x0e6f),            /* 0x0e6f X-Box 360 controllers */
         XPAD_XBOX360_VENDOR(0x12ab),            /* X-Box 360 dance pads */
         XPAD_XBOX360_VENDOR(0x1430),            /* RedOctane X-Box 360 controllers */
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index d5994a745ffa..982936334537 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -178,7 +178,6 @@ static int arizona_haptics_probe(struct platform_device *pdev)
         input_set_drvdata(haptics->input_dev, haptics);
 
         haptics->input_dev->name = "arizona:haptics";
-        haptics->input_dev->dev.parent = pdev->dev.parent;
         haptics->input_dev->close = arizona_haptics_close;
         __set_bit(FF_RUMBLE, haptics->input_dev->ffbit);
 
diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
index a806ba3818f7..8d6326d7e7be 100644
--- a/drivers/input/misc/max8997_haptic.c
+++ b/drivers/input/misc/max8997_haptic.c
@@ -255,12 +255,14 @@ static int max8997_haptic_probe(struct platform_device *pdev)
         struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
         const struct max8997_platform_data *pdata =
                                         dev_get_platdata(iodev->dev);
-        const struct max8997_haptic_platform_data *haptic_pdata =
-                                        pdata->haptic_pdata;
+        const struct max8997_haptic_platform_data *haptic_pdata = NULL;
         struct max8997_haptic *chip;
         struct input_dev *input_dev;
         int error;
 
+        if (pdata)
+                haptic_pdata = pdata->haptic_pdata;
+
         if (!haptic_pdata) {
                 dev_err(&pdev->dev, "no haptic platform data\n");
                 return -EINVAL;
diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c
index 3f02e0e03d12..67aab86048ad 100644
--- a/drivers/input/misc/pmic8xxx-pwrkey.c
+++ b/drivers/input/misc/pmic8xxx-pwrkey.c
@@ -353,7 +353,8 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev)
         if (of_property_read_u32(pdev->dev.of_node, "debounce", &kpd_delay))
                 kpd_delay = 15625;
 
-        if (kpd_delay > 62500 || kpd_delay == 0) {
+        /* Valid range of pwr key trigger delay is 1/64 sec to 2 seconds. */
+        if (kpd_delay > USEC_PER_SEC * 2 || kpd_delay < USEC_PER_SEC / 64) {
                 dev_err(&pdev->dev, "invalid power key trigger delay\n");
                 return -EINVAL;
         }
@@ -385,8 +386,8 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev)
         pwr->name = "pmic8xxx_pwrkey";
         pwr->phys = "pmic8xxx_pwrkey/input0";
 
-        delay = (kpd_delay << 10) / USEC_PER_SEC;
-        delay = 1 + ilog2(delay);
+        delay = (kpd_delay << 6) / USEC_PER_SEC;
+        delay = ilog2(delay);
 
         err = regmap_read(regmap, PON_CNTL_1, &pon_cntl);
         if (err < 0) {
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index 10c4e3d462f1..caa5a62c42fb 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -222,7 +222,6 @@ static int twl4030_vibra_probe(struct platform_device *pdev)
 
         info->input_dev->name = "twl4030:vibrator";
         info->input_dev->id.version = 1;
-        info->input_dev->dev.parent = pdev->dev.parent;
         info->input_dev->close = twl4030_vibra_close;
         __set_bit(FF_RUMBLE, info->input_dev->ffbit);
 
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index 36c8182b7bd2..5690eb7ff954 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -45,7 +45,6 @@
 struct vibra_info {
         struct device *dev;
         struct input_dev *input_dev;
-        struct workqueue_struct *workqueue;
         struct work_struct play_work;
 
         int irq;
@@ -182,6 +181,14 @@ static void vibra_play_work(struct work_struct *work)
 {
         struct vibra_info *info = container_of(work,
                                 struct vibra_info, play_work);
+        int ret;
+
+        /* Do not allow effect, while the routing is set to use audio */
+        ret = twl6040_get_vibralr_status(info->twl6040);
+        if (ret & TWL6040_VIBSEL) {
+                dev_info(info->dev, "Vibra is configured for audio\n");
+                return;
+        }
 
         if (info->weak_speed || info->strong_speed) {
                 if (!info->enabled)
@@ -197,24 +204,12 @@ static int vibra_play(struct input_dev *input, void *data,
                       struct ff_effect *effect)
 {
         struct vibra_info *info = input_get_drvdata(input);
-        int ret;
-
-        /* Do not allow effect, while the routing is set to use audio */
-        ret = twl6040_get_vibralr_status(info->twl6040);
-        if (ret & TWL6040_VIBSEL) {
-                dev_info(&input->dev, "Vibra is configured for audio\n");
-                return -EBUSY;
-        }
 
         info->weak_speed = effect->u.rumble.weak_magnitude;
         info->strong_speed = effect->u.rumble.strong_magnitude;
         info->direction = effect->direction < EFFECT_DIR_180_DEG ? 1 : -1;
 
-        ret = queue_work(info->workqueue, &info->play_work);
-        if (!ret) {
-                dev_info(&input->dev, "work is already on queue\n");
-                return ret;
-        }
+        schedule_work(&info->play_work);
 
         return 0;
 }
@@ -253,6 +248,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
         int vddvibr_uV = 0;
         int error;
 
+        of_node_get(twl6040_core_dev->of_node);
         twl6040_core_node = of_find_node_by_name(twl6040_core_dev->of_node,
                                                  "vibra");
         if (!twl6040_core_node) {
@@ -351,7 +347,6 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 
         info->input_dev->name = "twl6040:vibrator";
         info->input_dev->id.version = 1;
-        info->input_dev->dev.parent = pdev->dev.parent;
         info->input_dev->close = twl6040_vibra_close;
         __set_bit(FF_RUMBLE, info->input_dev->ffbit);
 
diff --git a/drivers/input/mouse/byd.c b/drivers/input/mouse/byd.c
index ec73f7564245..b27aa637f877 100644
--- a/drivers/input/mouse/byd.c
+++ b/drivers/input/mouse/byd.c
@@ -2,6 +2,10 @@
  * BYD TouchPad PS/2 mouse driver
  *
  * Copyright (C) 2015 Chris Diamand <chris@diamand.org>
+ * Copyright (C) 2015 Richard Pospesel
+ * Copyright (C) 2015 Tai Chi Minh Ralph Eastwood
+ * Copyright (C) 2015 Martin Wimpress
+ * Copyright (C) 2015 Jay Kuri
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published by
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
index 362ae3b5e188..abf09ac42ce4 100644
--- a/drivers/input/tablet/gtco.c
+++ b/drivers/input/tablet/gtco.c
@@ -857,6 +857,14 @@ static int gtco_probe(struct usb_interface *usbinterface,
                 goto err_free_buf;
         }
 
+        /* Sanity check that a device has an endpoint */
+        if (usbinterface->altsetting[0].desc.bNumEndpoints < 1) {
+                dev_err(&usbinterface->dev,
+                        "Invalid number of endpoints\n");
+                error = -EINVAL;
+                goto err_free_urb;
+        }
+
         /*
          * The endpoint is always altsetting 0, we know this since we know
          * this device only has one interrupt endpoint
@@ -878,7 +886,7 @@ static int gtco_probe(struct usb_interface *usbinterface,
          * HID report descriptor
          */
         if (usb_get_extra_descriptor(usbinterface->cur_altsetting,
-                                     HID_DEVICE_TYPE, &hid_desc) != 0){
+                                     HID_DEVICE_TYPE, &hid_desc) != 0) {
                 dev_err(&usbinterface->dev,
                         "Can't retrieve exta USB descriptor to get hid report descriptor length\n");
                 error = -EIO;
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 2160512e861a..5af7907d0af4 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1093,6 +1093,19 @@ static int mxt_t6_command(struct mxt_data *data, u16 cmd_offset,
         return 0;
 }
 
+static int mxt_acquire_irq(struct mxt_data *data)
+{
+        int error;
+
+        enable_irq(data->irq);
+
+        error = mxt_process_messages_until_invalid(data);
+        if (error)
+                return error;
+
+        return 0;
+}
+
 static int mxt_soft_reset(struct mxt_data *data)
 {
         struct device *dev = &data->client->dev;
@@ -1111,7 +1124,7 @@ static int mxt_soft_reset(struct mxt_data *data)
         /* Ignore CHG line for 100ms after reset */
         msleep(100);
 
-        enable_irq(data->irq);
+        mxt_acquire_irq(data);
 
         ret = mxt_wait_for_completion(data, &data->reset_completion,
                                       MXT_RESET_TIMEOUT);
@@ -1466,19 +1479,6 @@ release_mem:
         return ret;
 }
 
-static int mxt_acquire_irq(struct mxt_data *data)
-{
-        int error;
-
-        enable_irq(data->irq);
-
-        error = mxt_process_messages_until_invalid(data);
-        if (error)
-                return error;
-
-        return 0;
-}
-
 static int mxt_get_info(struct mxt_data *data)
 {
         struct i2c_client *client = data->client;
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index 9bbadaaf6bc3..7b3845aa5983 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -370,8 +370,8 @@ static int zforce_touch_event(struct zforce_ts *ts, u8 *payload)
                         point.coord_x = point.coord_y = 0;
                 }
 
-                point.state = payload[9 * i + 5] & 0x03;
-                point.id = (payload[9 * i + 5] & 0xfc) >> 2;
+                point.state = payload[9 * i + 5] & 0x0f;
+                point.id = (payload[9 * i + 5] & 0xf0) >> 4;
 
                 /* determine touch major, minor and orientation */
                 point.area_major = max(payload[9 * i + 6],