Merge branch 'next' into for-linus

Prepare second round of input updates for 4.14 merge window.

12 files changed, 380 insertions, 11 deletions

diff --git a/Documentation/devicetree/bindings/input/pwm-vibrator.txt b/Documentation/devicetree/bindings/input/pwm-vibrator.txt
new file mode 100644
index 000000000000..09145d18491d
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/pwm-vibrator.txt
@@ -0,0 +1,66 @@
+* PWM vibrator device tree bindings
+
+Registers a PWM device as vibrator. It is expected, that the vibrator's
+strength increases based on the duty cycle of the enable PWM channel
+(100% duty cycle meaning strongest vibration, 0% meaning no vibration).
+
+The binding supports an optional direction PWM channel, that can be
+driven at fixed duty cycle. If available this is can be used to increase
+the vibration effect of some devices.
+
+Required properties:
+- compatible: should contain "pwm-vibrator"
+- pwm-names: Should contain "enable" and optionally "direction"
+- pwms: Should contain a PWM handle for each entry in pwm-names
+
+Optional properties:
+- vcc-supply: Phandle for the regulator supplying power
+- direction-duty-cycle-ns: Duty cycle of the direction PWM channel in
+                           nanoseconds, defaults to 50% of the channel's
+                           period.
+
+Example from Motorola Droid 4:
+
+&omap4_pmx_core {
+        vibrator_direction_pin: pinmux_vibrator_direction_pin {
+                pinctrl-single,pins = <
+                OMAP4_IOPAD(0x1ce, PIN_OUTPUT | MUX_MODE1) /* dmtimer8_pwm_evt (gpio_27) */
+                >;
+        };
+
+        vibrator_enable_pin: pinmux_vibrator_enable_pin {
+                pinctrl-single,pins = <
+                OMAP4_IOPAD(0X1d0, PIN_OUTPUT | MUX_MODE1) /* dmtimer9_pwm_evt (gpio_28) */
+                >;
+        };
+};
+
+/ {
+        pwm8: dmtimer-pwm {
+                pinctrl-names = "default";
+                pinctrl-0 = <&vibrator_direction_pin>;
+
+                compatible = "ti,omap-dmtimer-pwm";
+                #pwm-cells = <3>;
+                ti,timers = <&timer8>;
+                ti,clock-source = <0x01>;
+        };
+
+        pwm9: dmtimer-pwm {
+                pinctrl-names = "default";
+                pinctrl-0 = <&vibrator_enable_pin>;
+
+                compatible = "ti,omap-dmtimer-pwm";
+                #pwm-cells = <3>;
+                ti,timers = <&timer9>;
+                ti,clock-source = <0x01>;
+        };
+
+        vibrator {
+                compatible = "pwm-vibrator";
+                pwms = <&pwm8 0 1000000000 0>,
+                       <&pwm9 0 1000000000 0>;
+                pwm-names = "enable", "direction";
+                direction-duty-cycle-ns = <1000000000>;
+        };
+};
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index d09cefa37931..15a71acb6997 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -313,7 +313,7 @@ static void adi_close(struct input_dev *dev)
 
 static void adi_init_digital(struct gameport *gameport)
 {
-        int seq[] = { 4, -2, -3, 10, -6, -11, -7, -9, 11, 0 };
+        static const int seq[] = { 4, -2, -3, 10, -6, -11, -7, -9, 11, 0 };
         int i;
 
         for (i = 0; seq[i]; i++) {
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index f8e34ef643c7..d86e59515b9c 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -1764,10 +1764,12 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
                 struct usb_endpoint_descriptor *ep =
                                 &intf->cur_altsetting->endpoint[i].desc;
 
-                if (usb_endpoint_dir_in(ep))
-                        ep_irq_in = ep;
-                else
-                        ep_irq_out = ep;
+                if (usb_endpoint_xfer_int(ep)) {
+                        if (usb_endpoint_dir_in(ep))
+                                ep_irq_in = ep;
+                        else
+                                ep_irq_out = ep;
+                }
         }
 
         if (!ep_irq_in || !ep_irq_out) {
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index f47e836eaa0f..9f082a388388 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -581,6 +581,18 @@ config INPUT_PWM_BEEPER
           To compile this driver as a module, choose M here: the module will be
           called pwm-beeper.
 
+config INPUT_PWM_VIBRA
+        tristate "PWM vibrator support"
+        depends on PWM
+        select INPUT_FF_MEMLESS
+        help
+          Say Y here to get support for PWM based vibrator devices.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the module will be
+          called pwm-vibra.
+
 config INPUT_RK805_PWRKEY
         tristate "Rockchip RK805 PMIC power key support"
         depends on MFD_RK808
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 1072e0760c19..03fd4262ada9 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -59,6 +59,7 @@ obj-$(CONFIG_INPUT_PM8XXX_VIBRATOR)	+= pm8xxx-vibrator.o
 obj-$(CONFIG_INPUT_PMIC8XXX_PWRKEY)     += pmic8xxx-pwrkey.o
 obj-$(CONFIG_INPUT_POWERMATE)           += powermate.o
 obj-$(CONFIG_INPUT_PWM_BEEPER)          += pwm-beeper.o
+obj-$(CONFIG_INPUT_PWM_VIBRA)           += pwm-vibra.o
 obj-$(CONFIG_INPUT_RB532_BUTTON)        += rb532_button.o
 obj-$(CONFIG_INPUT_REGULATOR_HAPTIC)    += regulator-haptic.o
 obj-$(CONFIG_INPUT_RETU_PWRBUTTON)      += retu-pwrbutton.o
diff --git a/drivers/input/misc/pwm-vibra.c b/drivers/input/misc/pwm-vibra.c
new file mode 100644
index 000000000000..55da191ae550
--- /dev/null
+++ b/drivers/input/misc/pwm-vibra.c
@@ -0,0 +1,267 @@
+/*
+ *  PWM vibrator driver
+ *
+ *  Copyright (C) 2017 Collabora Ltd.
+ *
+ *  Based on previous work from:
+ *  Copyright (C) 2012 Dmitry Torokhov <dmitry.torokhov@gmail.com>
+ *
+ *  Based on PWM beeper driver:
+ *  Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under  the terms of the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the License, or (at your
+ *  option) any later version.
+ */
+
+#include <linux/input.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
+#include <linux/pwm.h>
+#include <linux/regulator/consumer.h>
+#include <linux/slab.h>
+
+struct pwm_vibrator {
+        struct input_dev *input;
+        struct pwm_device *pwm;
+        struct pwm_device *pwm_dir;
+        struct regulator *vcc;
+
+        struct work_struct play_work;
+        u16 level;
+        u32 direction_duty_cycle;
+};
+
+static int pwm_vibrator_start(struct pwm_vibrator *vibrator)
+{
+        struct device *pdev = vibrator->input->dev.parent;
+        struct pwm_state state;
+        int err;
+