4 files changed, 272 insertions, 0 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7c0f1ecfdd7a..104a7c3153c0 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -72,6 +72,16 @@ config INPUT_AD714X_SPI
           To compile this driver as a module, choose M here: the
           module will be called ad714x-spi.
 
+config INPUT_ARIZONA_HAPTICS
+        tristate "Arizona haptics support"
+        depends on MFD_ARIZONA && SND_SOC
+        select INPUT_FF_MEMLESS
+        help
+          Say Y to enable support for the haptics module in Arizona CODECs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called arizona-haptics.
+
 config INPUT_BMA150
         tristate "BMA150/SMB380 acceleration sensor support"
         depends on I2C
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 83fe6f5b77d1..5ea769eda999 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_INPUT_ADXL34X)		+= adxl34x.o
 obj-$(CONFIG_INPUT_ADXL34X_I2C)         += adxl34x-i2c.o
 obj-$(CONFIG_INPUT_ADXL34X_SPI)         += adxl34x-spi.o
 obj-$(CONFIG_INPUT_APANEL)              += apanel.o
+obj-$(CONFIG_INPUT_ARIZONA_HAPTICS)     += arizona-haptics.o
 obj-$(CONFIG_INPUT_ATI_REMOTE2)         += ati_remote2.o
 obj-$(CONFIG_INPUT_ATLAS_BTNS)          += atlas_btns.o
 obj-$(CONFIG_INPUT_BFIN_ROTARY)         += bfin_rotary.o
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
new file mode 100644
index 000000000000..7a04f54ef961
--- /dev/null
+++ b/drivers/input/misc/arizona-haptics.c
@@ -0,0 +1,255 @@
+/*
+ * Arizona haptics driver
+ *
+ * Copyright 2012 Wolfson Microelectronics plc
+ *
+ * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/input.h>
+#include <linux/slab.h>
+
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+
+#include <linux/mfd/arizona/core.h>
+#include <linux/mfd/arizona/pdata.h>
+#include <linux/mfd/arizona/registers.h>
+
+struct arizona_haptics {
+        struct arizona *arizona;
+        struct input_dev *input_dev;
+        struct work_struct work;
+
+        struct mutex mutex;
+        u8 intensity;
+};
+
+static void arizona_haptics_work(struct work_struct *work)
+{
+        struct arizona_haptics *haptics = container_of(work,
+                                                       struct arizona_haptics,
+                                                       work);
+        struct arizona *arizona = haptics->arizona;
+        struct mutex *dapm_mutex = &arizona->dapm->card->dapm_mutex;
+        int ret;
+
+        if (!haptics->arizona->dapm) {
+                dev_err(arizona->dev, "No DAPM context\n");
+                return;
+        }
+
+        if (haptics->intensity) {
+                ret = regmap_update_bits(arizona->regmap,
+                                         ARIZONA_HAPTICS_PHASE_2_INTENSITY,
+                                         ARIZONA_PHASE2_INTENSITY_MASK,
+                                         haptics->intensity);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to set intensity: %d\n",
+                                ret);
+                        return;
+                }
+
+                /* This enable sequence will be a noop if already enabled */
+                ret = regmap_update_bits(arizona->regmap,
+                                         ARIZONA_HAPTICS_CONTROL_1,
+                                         ARIZONA_HAP_CTRL_MASK,
+                                         1 << ARIZONA_HAP_CTRL_SHIFT);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to start haptics: %d\n",
+                                ret);
+                        return;
+                }
+
+                mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
+
+                ret = snd_soc_dapm_enable_pin(arizona->dapm, "HAPTICS");
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to start HAPTICS: %d\n",
+                                ret);
+                        mutex_unlock(dapm_mutex);
+                        return;
+                }
+
+                ret = snd_soc_dapm_sync(arizona->dapm);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to sync DAPM: %d\n",
+                                ret);
+                        mutex_unlock(dapm_mutex);
+                        return;
+                }
+
+                mutex_unlock(dapm_mutex);
+
+        } else {
+                /* This disable sequence will be a noop if already enabled */
+                mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
+
+                ret = snd_soc_dapm_disable_pin(arizona->dapm, "HAPTICS");
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to disable HAPTICS: %d\n",
+                                ret);
+                        mutex_unlock(dapm_mutex);
+                        return;
+                }
+
+                ret = snd_soc_dapm_sync(arizona->dapm);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to sync DAPM: %d\n",
+                                ret);
+                        mutex_unlock(dapm_mutex);
+                        return;
+                }
+
+                mutex_unlock(dapm_mutex);
+
+                ret = regmap_update_bits(arizona->regmap,
+                                         ARIZONA_HAPTICS_CONTROL_1,
+                                         ARIZONA_HAP_CTRL_MASK,
+                                         1 << ARIZONA_HAP_CTRL_SHIFT);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to stop haptics: %d\n",
+                                ret);
+                        return;
+                }
+        }
+}
+
+static int arizona_haptics_play(struct input_dev *input, void *data,
+                                struct ff_effect *effect)
+{
+        struct arizona_haptics *haptics = input_get_drvdata(input);
+        struct arizona *arizona = haptics->arizona;
+
+        if (!arizona->dapm) {
+                dev_err(arizona->dev, "No DAPM context\n");
+                return -EBUSY;
+        }
+
+        if (effect->u.rumble.strong_magnitude) {
+                /* Scale the magnitude into the range the device supports */
+                if (arizona->pdata.hap_act) {
+                        haptics->intensity =
+                                effect->u.rumble.strong_magnitude >> 9;
+                        if (effect->direction < 0x8000)
+                                haptics->intensity += 0x7f;
+                } else {
+                        haptics->intensity =
+                                effect->u.rumble.strong_magnitude >> 8;
+                }
+        } else {
+                haptics->intensity = 0;
+        }
+
+        schedule_work(&haptics->work);
+
+        return 0;
+}
+
+static void arizona_haptics_close(struct input_dev *input)