7 files changed, 2008 insertions, 29 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 2ff4425a893b..23297ab6163f 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -144,6 +144,17 @@ config INPUT_M68K_BEEP
         tristate "M68k Beeper support"
         depends on M68K
 
+config INPUT_MAX77693_HAPTIC
+        tristate "MAXIM MAX77693 haptic controller support"
+        depends on MFD_MAX77693 && PWM
+        select INPUT_FF_MEMLESS
+        help
+          This option enables support for the haptic controller on
+          MAXIM MAX77693 chip.
+
+          To compile this driver as module, choose M here: the
+          module will be called max77693-haptic.
+
 config INPUT_MAX8925_ONKEY
         tristate "MAX8925 ONKEY support"
         depends on MFD_MAX8925
@@ -451,6 +462,16 @@ config HP_SDC_RTC
           Say Y here if you want to support the built-in real time clock
           of the HP SDC controller.
 
+config INPUT_PALMAS_PWRBUTTON
+        tristate "Palmas Power button Driver"
+        depends on MFD_PALMAS
+        help
+          Say Y here if you want to enable power key reporting via the
+          Palmas family of PMICs.
+
+          To compile this driver as a module, choose M here. The module will
+          be called palmas_pwrbutton.
+
 config INPUT_PCF50633_PMU
         tristate "PCF50633 PMU events"
         depends on MFD_PCF50633
@@ -676,4 +697,26 @@ config INPUT_SOC_BUTTON_ARRAY
           To compile this driver as a module, choose M here: the
           module will be called soc_button_array.
 
+config INPUT_DRV260X_HAPTICS
+        tristate "TI DRV260X haptics support"
+        depends on INPUT && I2C && GPIOLIB
+        select INPUT_FF_MEMLESS
+        select REGMAP_I2C
+        help
+          Say Y to enable support for the TI DRV260X haptics driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called drv260x-haptics.
+
+config INPUT_DRV2667_HAPTICS
+        tristate "TI DRV2667 haptics support"
+        depends on INPUT && I2C
+        select INPUT_FF_MEMLESS
+        select REGMAP_I2C
+        help
+          Say Y to enable support for the TI DRV2667 haptics driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called drv260x-haptics.
+
 endif
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 4955ad322a01..19c760361f80 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -26,6 +26,8 @@ obj-$(CONFIG_INPUT_COBALT_BTNS)		+= cobalt_btns.o
 obj-$(CONFIG_INPUT_DA9052_ONKEY)        += da9052_onkey.o
 obj-$(CONFIG_INPUT_DA9055_ONKEY)        += da9055_onkey.o
 obj-$(CONFIG_INPUT_DM355EVM)            += dm355evm_keys.o
+obj-$(CONFIG_INPUT_DRV260X_HAPTICS)     += drv260x.o
+obj-$(CONFIG_INPUT_DRV2667_HAPTICS)     += drv2667.o
 obj-$(CONFIG_INPUT_GP2A)                += gp2ap002a00f.o
 obj-$(CONFIG_INPUT_GPIO_BEEPER)         += gpio-beeper.o
 obj-$(CONFIG_INPUT_GPIO_TILT_POLLED)    += gpio_tilt_polled.o
@@ -35,11 +37,13 @@ obj-$(CONFIG_INPUT_IXP4XX_BEEPER)	+= ixp4xx-beeper.o
 obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)      += keyspan_remote.o
 obj-$(CONFIG_INPUT_KXTJ9)               += kxtj9.o
 obj-$(CONFIG_INPUT_M68K_BEEP)           += m68kspkr.o
+obj-$(CONFIG_INPUT_MAX77693_HAPTIC)     += max77693-haptic.o
 obj-$(CONFIG_INPUT_MAX8925_ONKEY)       += max8925_onkey.o
 obj-$(CONFIG_INPUT_MAX8997_HAPTIC)      += max8997_haptic.o
 obj-$(CONFIG_INPUT_MC13783_PWRBUTTON)   += mc13783-pwrbutton.o
 obj-$(CONFIG_INPUT_MMA8450)             += mma8450.o
 obj-$(CONFIG_INPUT_MPU3050)             += mpu3050.o
+obj-$(CONFIG_INPUT_PALMAS_PWRBUTTON)    += palmas-pwrbutton.o
 obj-$(CONFIG_INPUT_PCAP)                += pcap_keys.o
 obj-$(CONFIG_INPUT_PCF50633_PMU)        += pcf50633-input.o
 obj-$(CONFIG_INPUT_PCF8574)             += pcf8574_keypad.o
diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c
new file mode 100644
index 000000000000..cab87f5ce6d3
--- /dev/null
+++ b/drivers/input/misc/drv260x.c
@@ -0,0 +1,741 @@
+/*
+ * DRV260X haptics driver family
+ *
+ * Author: Dan Murphy <dmurphy@ti.com>
+ *
+ * Copyright:   (C) 2014 Texas Instruments, Inc.
+ *
+ * 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 the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/module.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/regulator/consumer.h>
+
+#include <dt-bindings/input/ti-drv260x.h>
+#include <linux/platform_data/drv260x-pdata.h>
+
+#define DRV260X_STATUS          0x0
+#define DRV260X_MODE            0x1
+#define DRV260X_RT_PB_IN        0x2
+#define DRV260X_LIB_SEL         0x3
+#define DRV260X_WV_SEQ_1        0x4
+#define DRV260X_WV_SEQ_2        0x5
+#define DRV260X_WV_SEQ_3        0x6
+#define DRV260X_WV_SEQ_4        0x7
+#define DRV260X_WV_SEQ_5        0x8
+#define DRV260X_WV_SEQ_6        0x9
+#define DRV260X_WV_SEQ_7        0xa
+#define DRV260X_WV_SEQ_8        0xb
+#define DRV260X_GO                              0xc
+#define DRV260X_OVERDRIVE_OFF   0xd
+#define DRV260X_SUSTAIN_P_OFF   0xe
+#define DRV260X_SUSTAIN_N_OFF   0xf
+#define DRV260X_BRAKE_OFF               0x10
+#define DRV260X_A_TO_V_CTRL             0x11
+#define DRV260X_A_TO_V_MIN_INPUT        0x12
+#define DRV260X_A_TO_V_MAX_INPUT        0x13
+#define DRV260X_A_TO_V_MIN_OUT  0x14
+#define DRV260X_A_TO_V_MAX_OUT  0x15
+#define DRV260X_RATED_VOLT              0x16
+#define DRV260X_OD_CLAMP_VOLT   0x17
+#define DRV260X_CAL_COMP                0x18
+#define DRV260X_CAL_BACK_EMF    0x19
+#define DRV260X_FEEDBACK_CTRL   0x1a
+#define DRV260X_CTRL1                   0x1b
+#define DRV260X_CTRL2                   0x1c
+#define DRV260X_CTRL3                   0x1d
+#define DRV260X_CTRL4                   0x1e
+#define DRV260X_CTRL5                   0x1f
+#define DRV260X_LRA_LOOP_PERIOD 0x20
+#define DRV260X_VBAT_MON                0x21
+#define DRV260X_LRA_RES_PERIOD  0x22
+#define DRV260X_MAX_REG                 0x23
+
+#define DRV260X_GO_BIT                          0x01
+
+/* Library Selection */
+#define DRV260X_LIB_SEL_MASK            0x07
+#define DRV260X_LIB_SEL_RAM                     0x0
+#define DRV260X_LIB_SEL_OD                      0x1
+#define DRV260X_LIB_SEL_40_60           0x2
+#define DRV260X_LIB_SEL_60_80           0x3
+#define DRV260X_LIB_SEL_100_140         0x4
+#define DRV260X_LIB_SEL_140_PLUS        0x5
+
+#define DRV260X_LIB_SEL_HIZ_MASK        0x10
+#define DRV260X_LIB_SEL_HIZ_EN          0x01