Merge branch 'next' into for-linus

11 files changed, 1482 insertions, 41 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 01344280e14..a1aa35a053b 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -62,6 +62,17 @@ config INPUT_AD714X_SPI
           To compile this driver as a module, choose M here: the
           module will be called ad714x-spi.
 
+config INPUT_BMA150
+        tristate "BMA150/SMB380 acceleration sensor support"
+        depends on I2C
+        select INPUT_POLLDEV
+        help
+          Say Y here if you have Bosch Sensortec's BMA150 or SMB380
+          acceleration sensor hooked to an I2C bus.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bma150.
+
 config INPUT_PCSPKR
         tristate "PC Speaker support"
         depends on PCSPKR_PLATFORM
@@ -74,6 +85,29 @@ config INPUT_PCSPKR
           To compile this driver as a module, choose M here: the
           module will be called pcspkr.
 
+config INPUT_PM8XXX_VIBRATOR
+        tristate "Qualcomm PM8XXX vibrator support"
+        depends on MFD_PM8XXX
+        select INPUT_FF_MEMLESS
+        help
+          This option enables device driver support for the vibrator
+          on Qualcomm PM8xxx chip. This driver supports ff-memless interface
+          from input framework.
+
+          To compile this driver as module, choose M here: the
+          module will be called pm8xxx-vibrator.
+
+config INPUT_PMIC8XXX_PWRKEY
+        tristate "PMIC8XXX power key support"
+        depends on MFD_PM8XXX
+        help
+          Say Y here if you want support for the PMIC8XXX power key.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called pmic8xxx-pwrkey.
+
 config INPUT_SPARCSPKR
         tristate "SPARC Speaker support"
         depends on PCI && SPARC64
@@ -305,7 +339,7 @@ config INPUT_TWL4030_PWRBUTTON
 config INPUT_TWL4030_VIBRA
         tristate "Support for TWL4030 Vibrator"
         depends on TWL4030_CORE
-        select TWL4030_CODEC
+        select MFD_TWL4030_AUDIO
         select INPUT_FF_MEMLESS
         help
           This option enables support for TWL4030 Vibrator Driver.
@@ -313,6 +347,17 @@ config INPUT_TWL4030_VIBRA
           To compile this driver as a module, choose M here. The module will
           be called twl4030_vibra.
 
+config INPUT_TWL6040_VIBRA
+        tristate "Support for TWL6040 Vibrator"
+        depends on TWL4030_CORE
+        select TWL6040_CORE
+        select INPUT_FF_MEMLESS
+        help
+          This option enables support for TWL6040 Vibrator Driver.
+
+          To compile this driver as a module, choose M here. The module will
+          be called twl6040_vibra.
+
 config INPUT_UINPUT
         tristate "User level driver support"
         help
@@ -368,17 +413,6 @@ config INPUT_PWM_BEEPER
           To compile this driver as a module, choose M here: the module will be
           called pwm-beeper.
 
-config INPUT_PMIC8XXX_PWRKEY
-        tristate "PMIC8XXX power key support"
-        depends on MFD_PM8XXX
-        help
-          Say Y here if you want support for the PMIC8XXX power key.
-
-          If unsure, say N.
-
-          To compile this driver as a module, choose M here: the
-          module will be called pmic8xxx-pwrkey.
-
 config INPUT_GPIO_ROTARY_ENCODER
         tristate "Rotary encoders connected to GPIO pins"
         depends on GPIOLIB && GENERIC_GPIO
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index be39d813354..53a8d0faad5 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_INPUT_ATI_REMOTE)		+= ati_remote.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
+obj-$(CONFIG_INPUT_BMA150)              += bma150.o
 obj-$(CONFIG_INPUT_CM109)               += cm109.o
 obj-$(CONFIG_INPUT_CMA3000)             += cma3000_d0x.o
 obj-$(CONFIG_INPUT_CMA3000_I2C)         += cma3000_d0x_i2c.o
@@ -34,15 +35,17 @@ obj-$(CONFIG_INPUT_PCAP)		+= pcap_keys.o
 obj-$(CONFIG_INPUT_PCF50633_PMU)        += pcf50633-input.o
 obj-$(CONFIG_INPUT_PCF8574)             += pcf8574_keypad.o
 obj-$(CONFIG_INPUT_PCSPKR)              += pcspkr.o
+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_PMIC8XXX_PWRKEY)     += pmic8xxx-pwrkey.o
 obj-$(CONFIG_INPUT_RB532_BUTTON)        += rb532_button.o
 obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o
 obj-$(CONFIG_INPUT_SGI_BTNS)            += sgi_btns.o
 obj-$(CONFIG_INPUT_SPARCSPKR)           += sparcspkr.o
 obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON)   += twl4030-pwrbutton.o
 obj-$(CONFIG_INPUT_TWL4030_VIBRA)       += twl4030-vibra.o
+obj-$(CONFIG_INPUT_TWL6040_VIBRA)       += twl6040-vibra.o
 obj-$(CONFIG_INPUT_UINPUT)              += uinput.o
 obj-$(CONFIG_INPUT_WISTRON_BTNS)        += wistron_btns.o
 obj-$(CONFIG_INPUT_WM831X_ON)           += wm831x-on.o
diff --git a/drivers/input/misc/ad714x-i2c.c b/drivers/input/misc/ad714x-i2c.c
index 025417d74ca..56810fb4ead 100644
--- a/drivers/input/misc/ad714x-i2c.c
+++ b/drivers/input/misc/ad714x-i2c.c
@@ -116,13 +116,13 @@ static struct i2c_driver ad714x_i2c_driver = {
         .id_table = ad714x_id,
 };
 
-static __init int ad714x_i2c_init(void)
+static int __init ad714x_i2c_init(void)
 {
         return i2c_add_driver(&ad714x_i2c_driver);
 }
 module_init(ad714x_i2c_init);
 
-static __exit void ad714x_i2c_exit(void)
+static void __exit ad714x_i2c_exit(void)
 {
         i2c_del_driver(&ad714x_i2c_driver);
 }
diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c
new file mode 100644
index 00000000000..8f55b54352b
--- /dev/null
+++ b/drivers/input/misc/bma150.c
@@ -0,0 +1,691 @@
+/*
+ * Copyright (c) 2011 Bosch Sensortec GmbH
+ * Copyright (c) 2011 Unixphere
+ *
+ * This driver adds support for Bosch Sensortec's digital acceleration
+ * sensors BMA150 and SMB380.
+ * The SMB380 is fully compatible with BMA150 and only differs in packaging.
+ *
+ * The datasheet for the BMA150 chip can be found here:
+ * http://www.bosch-sensortec.com/content/language1/downloads/BST-BMA150-DS000-07.pdf
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/input-polldev.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/pm.h>
+#include <linux/pm_runtime.h>
+#include <linux/bma150.h>
+
+#define ABSMAX_ACC_VAL          0x01FF
+#define ABSMIN_ACC_VAL          -(ABSMAX_ACC_VAL)
+
+/* Each axis is represented by a 2-byte data word */
+#define BMA150_XYZ_DATA_SIZE    6
+
+/* Input poll interval in milliseconds */
+#define BMA150_POLL_INTERVAL    10
+#define BMA150_POLL_MAX         200
+#define BMA150_POLL_MIN         0
+
+#define BMA150_BW_25HZ          0
+#define BMA150_BW_50HZ          1
+#define BMA150_BW_100HZ         2
+#define BMA150_BW_190HZ         3
+#define BMA150_BW_375HZ         4
+#define BMA150_BW_750HZ         5
+#define BMA150_BW_1500HZ        6
+
+#define BMA150_RANGE_2G         0
+#define BMA150_RANGE_4G         1
+#define BMA150_RANGE_8G         2
+
+#define BMA150_MODE_NORMAL      0
+#define BMA150_MODE_SLEEP       2
+#define BMA150_MODE_WAKE_UP     3
+
+/* Data register addresses */
+#define BMA150_DATA_0_REG       0x00
+#define BMA150_DATA_1_REG       0x01
+#define BMA150_DATA_2_REG       0x02
+
+/* Control register addresses */
+#define BMA150_CTRL_0_REG       0x0A
+#define BMA150_CTRL_1_REG       0x0B
+#define BMA150_CTRL_2_REG       0x14
+#define BMA150_CTRL_3_REG       0x15
+
+/* Configuration/Setting register addresses */
+#define BMA150_CFG_0_REG        0x0C
+#define BMA150_CFG_1_REG        0x0D
+#define BMA150_CFG_2_REG        0x0E
+#define BMA150_CFG_3_REG        0x0F
+#define BMA150_CFG_4_REG        0x10
+#define BMA150_CFG_5_REG        0x11
+
+#define BMA150_CHIP_ID          2
+#define BMA150_CHIP_ID_REG      BMA150_DATA_0_REG
+
+#define BMA150_ACC_X_LSB_REG    BMA150_DATA_2_REG
+
+#define BMA150_SLEEP_POS        0
+#define BMA150_SLEEP_MSK        0x01
+#define BMA150_SLEEP_REG        BMA150_CTRL_0_REG
+
+#define BMA150_BANDWIDTH_POS    0
+#define BMA150_BANDWIDTH_MSK    0x07
+#define BMA150_BANDWIDTH_REG    BMA150_CTRL_2_REG
+
+#define BMA150_RANGE_POS        3
+#define BMA150_RANGE_MSK        0x18
+#define BMA150_RANGE_REG        BMA150_CTRL_2_REG
+
+#define BMA150_WAKE_UP_POS      0
+#define BMA150_WAKE_UP_MSK      0x01
+#define BMA150_WAKE_UP_REG      BMA150_CTRL_3_REG
+
+#define BMA150_SW_RES_POS       1
+#define BMA150_SW_RES_MSK       0x02
+#define BMA150_SW_RES_REG       BMA150_CTRL_0_REG
+
+/* Any-motion interrupt register fields */
+#define BMA150_ANY_MOTION_EN_POS        6
+#define BMA150_ANY_MOTION_EN_MSK        0x40
+#define BMA150_ANY_MOTION_EN_REG        BMA150_CTRL_1_REG
+
+#define BMA150_ANY_MOTION_DUR_POS       6
+#define BMA150_ANY_MOTION_DUR_MSK       0xC0
+#define BMA150_ANY_MOTION_DUR_REG       BMA150_CFG_5_REG
+
+#define BMA150_ANY_MOTION_THRES_REG     BMA150_CFG_4_REG
+
+/* Advanced interrupt register fields */
+#define BMA150_ADV_INT_EN_POS           6
+#define BMA150_ADV_INT_EN_MSK           0x40
+#define BMA150_ADV_INT_EN_REG           BMA150_CTRL_3_REG
+
+/* High-G interrupt register fields */
+#define BMA150_HIGH_G_EN_POS            1
+#define BMA150_HIGH_G_EN_MSK            0x02
+#define BMA150_HIGH_G_EN_REG            BMA150_CTRL_1_REG
+
+#define BMA150_HIGH_G_HYST_POS          3
+#define BMA150_HIGH_G_HYST_MSK          0x38
+#define BMA150_HIGH_G_HYST_REG          BMA150_CFG_5_REG
+
+#define BMA150_HIGH_G_DUR_REG           BMA150_CFG_3_REG
+#define BMA150_HIGH_G_THRES_REG         BMA150_CFG_2_REG
+
+/* Low-G interrupt register fields */
+#define BMA150_LOW_G_EN_POS             0
+#define BMA150_LOW_G_EN_MSK             0x01
+#define BMA150_LOW_G_EN_REG             BMA150_CTRL_1_REG
+
+#define BMA150_LOW_G_HYST_POS           0
+#define BMA150_LOW_G_HYST_MSK           0x07
+#define BMA150_LOW_G_HYST_REG           BMA150_CFG_5_REG
+
+#define BMA150_LOW_G_DUR_REG            BMA150_CFG_1_REG
+#define BMA150_LOW_G_THRES_REG          BMA150_CFG_0_REG
+
+struct bma150_data {
+        struct i2c_client *client;
+        struct input_polled_dev *input_polled;
+        struct input_dev *input;
+        u8 mode;
+};
+
+/*
+ * The settings for the given range, bandwidth and interrupt features
+ * are stated and verified by Bosch Sensortec where they are configured
+ * to provide a generic sensitivity performance.
+ */
+static struct bma150_cfg default_cfg __devinitdata = {
+        .any_motion_int = 1,
+        .hg_int = 1,
+        .lg_int = 1,
+        .any_motion_dur = 0,
+        .any_motion_thres = 0,
+        .hg_hyst = 0,
+        .hg_dur = 150,
+        .hg_thres = 160,
+        .lg_hyst = 0,
+        .lg_dur = 150,
+        .lg_thres = 20,
+        .range = BMA150_RANGE_2G,
+        .bandwidth = BMA150_BW_50HZ
+};
+
+static int bma150_write_byte(struct i2c_client *client, u8 reg, u8 val)
+{
+        s32 ret;
+
+        /* As per specification, disable irq in between register writes */
+        if (client->irq)
+                disable_irq_nosync(client->irq);
+
+        ret = i2c_smbus_write_byte_data(client, reg, val);
+
+        if (client->irq)
+                enable_irq(client->irq);
+
+        return ret;
+}
+
+static int bma150_set_reg_bits(struct i2c_client *client,
+                                        int val, int shift, u8 mask, u8 reg)
+{
+        int data;
+
+        data = i2c_smbus_read_byte_data(client, reg);
+        if (data < 0)
+                return data;
+
+        data = (data & ~mask) | ((val << shift) & mask);
+        return bma150_write_byte(client, reg, data);
+}
+
+static int bma150_set_mode(struct bma150_data *bma150, u8 mode)
+{
+        int error;
+
+        error = bma150_set_reg_bits(bma150->client, mode, BMA150_WAKE_UP_POS,
+                                BMA150_WAKE_UP_MSK, BMA150_WAKE_UP_REG);
+        if (error)
+                return error;
+
+        error = bma150_set_reg_bits(bma150->client, mode, BMA150_SLEEP_POS,
+                                BMA150_SLEEP_MSK, BMA150_SLEEP_REG);
+        if (error)
+                return error;
+
+        if (mode == BMA150_MODE_NORMAL)
+                msleep(2);
+
+        bma150->mode = mode;
+        return 0;
+}
+
+static int __devinit bma150_soft_reset(struct bma150_data *bma150)
+{
+        int error;
+
+        error = bma150_set_reg_bits(bma150->client, 1, BMA150_SW_RES_POS,
+                                BMA150_SW_RES_MSK, BMA150_SW_RES_REG);
+        if (error)
+                return error;
+
+        msleep(2);
+        return 0;
+}
+
+static int __devinit bma150_set_range(struct bma150_data *bma150, u8 range)
+{
+        return bma150_set_reg_bits(bma150->client, range, BMA150_RANGE_POS,
+                                BMA150_RANGE_MSK, BMA150_RANGE_REG);
+}
+
+static int __devinit bma150_set_bandwidth(struct bma150_data *bma150, u8 bw)
+{
+        return bma150_set_reg_bits(bma150->client, bw, BMA150_BANDWIDTH_POS,
+                                BMA150_BANDWIDTH_MSK, BMA150_BANDWIDTH_REG);
+}
+
+static int __devinit bma150_set_low_g_interrupt(struct bma150_data *bma150,
+                                        u8 enable, u8 hyst, u8 dur, u8 thres)
+{
+        int error;
+
+        error = bma150_set_reg_bits(bma150->client, hyst,
+                                BMA150_LOW_G_HYST_POS, BMA150_LOW_G_HYST_MSK,
+                                BMA150_LOW_G_HYST_REG);
+        if (error)
+                return error;
+
+        error = bma150_write_byte(bma150->client, BMA150_LOW_G_DUR_REG, dur);
+        if (error)
+                return error;
+
+        error = bma150_write_byte(bma150->client, BMA150_LOW_G_THRES_REG, thres);
+        if (error)
+                return error;
+
+        return bma150_set_reg_bits(bma150->client, !!enable,
+                                BMA150_LOW_G_EN_POS, BMA150_LOW_G_EN_MSK,
+                                BMA150_LOW_G_EN_REG);
+}
+
+static int __devinit bma150_set_high_g_interrupt(struct bma150_data *bma150,
+                                        u8 enable, u8 hyst, u8 dur, u8 thres)
+{
+        int error;
+
+        error = bma150_set_reg_bits(bma150->client, hyst,
+                                BMA150_HIGH_G_HYST_POS, BMA150_HIGH_G_HYST_MSK,
+                                BMA150_HIGH_G_HYST_REG);
+        if (error)
+                return error;
+
+        error = bma150_write_byte(bma150->client,
+                                BMA150_HIGH_G_DUR_REG, dur);
+        if (error)
+                return error;
+
+        error = bma150_write_byte(bma150->client,
+                                BMA150_HIGH_G_THRES_REG, thres);
+        if (error)
+                return error;
+
+        return bma150_set_reg_bits(bma150->client, !!enable,
+                                BMA150_HIGH_G_EN_POS, BMA150_HIGH_G_EN_MSK,
+                                BMA150_HIGH_G_EN_REG);
+}
+
+
+static int __devinit bma150_set_any_motion_interrupt(struct bma150_data *bma150,
+                                                u8 enable, u8 dur, u8 thres)
+{
+        int error;
+
+        error = bma150_set_reg_bits(bma150->client, dur,
+                                BMA150_ANY_MOTION_DUR_POS,
+                                BMA150_ANY_MOTION_DUR_MSK,
+                                BMA150_ANY_MOTION_DUR_REG);
+        if (error)
+                return error;
+
+        error = bma150_write_byte(bma150->client,
+                                BMA150_ANY_MOTION_THRES_REG, thres);
+        if (error)
+                return error;
+
+        error = bma150_set_reg_bits(bma150->client, !!enable,
+                                BMA150_ADV_INT_EN_POS, BMA150_ADV_INT_EN_MSK,
+                                BMA150_ADV_INT_EN_REG);
+        if (error)
+                return error;
+
+        return bma150_set_reg_bits(bma150->client, !!enable,
+                                BMA150_ANY_MOTION_EN_POS,
+                                BMA150_ANY_MOTION_EN_MSK,
+                                BMA150_ANY_MOTION_EN_REG);
+}
+
+static void bma150_report_xyz(struct bma150_data *bma150)
+{
+        u8 data[BMA150_XYZ_DATA_SIZE];
+        s16 x, y, z;
+        s32 ret;
+
+        ret = i2c_smbus_read_i2c_block_data(bma150->client,
+                        BMA150_ACC_X_LSB_REG, BMA150_XYZ_DATA_SIZE, data);
+        if (ret != BMA150_XYZ_DATA_SIZE)
+                return;
+
+        x = ((0xc0 & data[0]) >> 6) | (data[1] << 2);
+        y = ((0xc0 & data[2]) >> 6) | (data[3] << 2);
+        z = ((0xc0 & data[4]) >> 6) | (data[5] << 2);
+
+        /* sign extension */
+        x = (s16) (x << 6) >> 6;
+        y = (s16) (y << 6) >> 6;
+        z = (s16) (z << 6) >> 6;
+
+        input_report_abs(bma150->input, ABS_X, x);
+        input_report_abs(bma150->input, ABS_Y, y);
+        input_report_abs(bma150->input, ABS_Z, z);
+        input_sync(bma150->input);
+}
+
+static irqreturn_t bma150_irq_thread(int irq, void *dev)
+{
+        bma150_report_xyz(dev);
+
+        return IRQ_HANDLED;
+}
+
+static void bma150_poll(struct input_polled_dev *dev)
+{
+        bma150_report_xyz(dev->private);
+}
+
+static int bma150_open(struct bma150_data *bma150)
+{
+        int error;
+
+        error = pm_runtime_get_sync(&bma150->client->dev);
+        if (error && error != -ENOSYS)
+                return error;
+
+        /*
+         * See if runtime PM woke up the device. If runtime PM
+         * is disabled we need to do it ourselves.
+         */
+        if (bma150->mode != BMA150_MODE_NORMAL) {
+                error = bma150_set_mode(bma150, BMA150_MODE_NORMAL);
+                if (error)
+                        return error;
+        }
+
+        return 0;
+}
+
+static void bma150_close(struct bma150_data *bma150)
+{
+        pm_runtime_put_sync(&bma150->client->dev);
+
+        if (bma150->mode != BMA150_MODE_SLEEP)
+                bma150_set_mode(bma150, BMA150_MODE_SLEEP);
+}
+
+static int bma150_irq_open(struct input_dev *input)
+{
+        struct bma150_data *bma150 = input_get_drvdata(input);
+
+        return bma150_open(bma150);
+}
+
+static void bma150_irq_close(struct input_dev *input)
+{
+        struct bma150_data *bma150 = input_get_drvdata(input);
+
+        bma150_close(bma150);
+}
+
+static void bma150_poll_open(struct input_polled_dev *ipoll_dev)
+{
+        struct bma150_data *bma150 = ipoll_dev->private;
+
+        bma150_open(bma150);
+}
+
+static void bma150_poll_close(struct input_polled_dev *ipoll_dev)
+{
+        struct bma150_data *bma150 = ipoll_dev->private;
+
+        bma150_close(bma150);
+}
+
+static int __devinit bma150_initialize(struct bma150_data *bma150,
+                                       const struct bma150_cfg *cfg)
+{
+        int error;
+
+        error = bma150_soft_reset(bma150);
+        if (error)
+                return error;
+
+        error = bma150_set_bandwidth(bma150, cfg->bandwidth);
+        if (error)
+                return error;
+
+        error = bma150_set_range(bma150, cfg->range);
+        if (error)
+                return error;
+
+        if (bma150->client->irq) {
+                error = bma150_set_any_motion_interrupt(bma150,
+                                        cfg->any_motion_int,
+                                        cfg->any_motion_dur,
+                                        cfg->any_motion_thres);
+                if (error)
+                        return error;
+
+                error = bma150_set_high_g_interrupt(bma150,
+                                        cfg->hg_int, cfg->hg_hyst,
+                                        cfg->hg_dur, cfg->hg_thres);
+                if (error)
+                        return error;
+
+                error = bma150_set_low_g_interrupt(bma150,
+                                        cfg->lg_int, cfg->lg_hyst,
+                                        cfg->lg_dur, cfg->lg_thres);
+                if (error)
+                        return error;
+        }
+
+        return bma150_set_mode(bma150, BMA150_MODE_SLEEP);
+}
+
+static void __devinit bma150_init_input_device(struct bma150_data *bma150,
+                                                struct input_dev *idev)
+{
+        idev->name = BMA150_DRIVER;
+        idev->phys = BMA150_DRIVER "/input0";
+        idev->id.bustype = BUS_I2C;
+        idev->dev.parent = &bma150->client->dev;
+
+        idev->evbit[0] = BIT_MASK(EV_ABS);
+        input_set_abs_params(idev, ABS_X, ABSMIN_ACC_VAL, ABSMAX_ACC_VAL, 0, 0);
+        input_set_abs_params(idev, ABS_Y, ABSMIN_ACC_VAL, ABSMAX_ACC_VAL, 0, 0);
+        input_set_abs_params(idev, ABS_Z, ABSMIN_ACC_VAL, ABSMAX_ACC_VAL, 0, 0);
+}
+
+static int __devinit bma150_register_input_device(struct bma150_data *bma150)
+{
+        struct input_dev *idev;
+        int error;
+
+        idev = input_allocate_device();
+        if (!idev)
+                return -ENOMEM;
+
+        bma150_init_input_device(bma150, idev);
+
+        idev->open = bma150_irq_open;
+        idev->close = bma150_irq_close;
+        input_set_drvdata(idev, bma150);
+
+        error = input_register_device(idev);
+        if (error) {
+                input_free_device(idev);
+                return error;
+        }
+
+        bma150->input = idev;
+        return 0;
+}
+
+static int __devinit bma150_register_polled_device(struct bma150_data *bma150)
+{
+        struct input_polled_dev *ipoll_dev;
+        int error;
+
+        ipoll_dev = input_allocate_polled_device();
+        if (!ipoll_dev)
+                return -ENOMEM;
+
+        ipoll_dev->private = bma150;
+        ipoll_dev->open = bma150_poll_open;
+        ipoll_dev->close = bma150_poll_close;
+        ipoll_dev->poll = bma150_poll;
+        ipoll_dev->poll_interval = BMA150_POLL_INTERVAL;
+        ipoll_dev->poll_interval_min = BMA150_POLL_MIN;
+        ipoll_dev->poll_interval_max = BMA150_POLL_MAX;
+
+        bma150_init_input_device(bma150, ipoll_dev->input);
+
+        error = input_register_polled_device(ipoll_dev);
+        if (error) {
+                input_free_polled_device(ipoll_dev);
+                return error;
+        }
+
+        bma150->input_polled = ipoll_dev;
+        bma150->input = ipoll_dev->input;
+
+        return 0;
+}
+
+static int __devinit bma150_probe(struct i2c_client *client,
+                                  const struct i2c_device_id *id)
+{
+        const struct bma150_platform_data *pdata = client->dev.platform_data;
+        const struct bma150_cfg *cfg;
+        struct bma150_data *bma150;
+        int chip_id;
+        int error;
+
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
+                dev_err(&client->dev, "i2c_check_functionality error\n");
+                return -EIO;
+        }
+
+        chip_id = i2c_smbus_read_byte_data(client, BMA150_CHIP_ID_REG);
+        if (chip_id != BMA150_CHIP_ID) {
+                dev_err(&client->dev, "BMA150 chip id error: %d\n", chip_id);
+                return -EINVAL;
+        }
+
+        bma150 = kzalloc(sizeof(struct bma150_data), GFP_KERNEL);
+        if (!bma150)
+                return -ENOMEM;
+
+        bma150->client = client;
+
+        if (pdata) {
+                if (pdata->irq_gpio_cfg) {
+                        error = pdata->irq_gpio_cfg();
+                        if (error) {
+                                dev_err(&client->dev,
+                                        "IRQ GPIO conf. error %d, error %d\n",
+                                        client->irq, error);
+                                goto err_free_mem;
+                        }
+                }
+                cfg = &pdata->cfg;
+        } else {
+                cfg = &default_cfg;
+        }
+
+        error = bma150_initialize(bma150, cfg);
+        if (error)
+                goto err_free_mem;
+
+        if (client->irq > 0) {
+                error = bma150_register_input_device(bma150);
+                if (error)
+                        goto err_free_mem;
+
+                error = request_threaded_irq(client->irq,
+                                        NULL, bma150_irq_thread,
+                                        IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                        BMA150_DRIVER, bma150);
+                if (error) {
+                        dev_err(&client->dev,
+                                "irq request failed %d, error %d\n",
+                                client->irq, error);
+                        input_unregister_device(bma150->input);
+                        goto err_free_mem;
+                }
+        } else {
+                error = bma150_register_polled_device(bma150);
+                if (error)
+                        goto err_free_mem;
+        }
+
+        i2c_set_clientdata(client, bma150);
+
+        pm_runtime_enable(&client->dev);
+
+        return 0;
+
+err_free_mem:
+        kfree(bma150);
+        return error;
+}
+
+static int __devexit bma150_remove(struct i2c_client *client)
+{
+        struct bma150_data *bma150 = i2c_get_clientdata(client);
+
+        pm_runtime_disable(&client->dev);
+
+        if (client->irq > 0) {
+                free_irq(client->irq, bma150);
+                input_unregister_device(bma150->input);
+        } else {
+                input_unregister_polled_device(bma150->input_polled);
+                input_free_polled_device(bma150->input_polled);
+        }
+
+        kfree(bma150);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int bma150_suspend(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct bma150_data *bma150 = i2c_get_clientdata(client);
+
+        return bma150_set_mode(bma150, BMA150_MODE_SLEEP);
+}
+
+static int bma150_resume(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct bma150_data *bma150 = i2c_get_clientdata(client);
+
+        return bma150_set_mode(bma150, BMA150_MODE_NORMAL);
+}
+#endif
+
+static UNIVERSAL_DEV_PM_OPS(bma150_pm, bma150_suspend, bma150_resume, NULL);
+
+static const struct i2c_device_id bma150_id[] = {
+        { "bma150", 0 },
+        { "smb380", 0 },
+        { "bma023", 0 },
+        { }
+};
+
+MODULE_DEVICE_TABLE(i2c, bma150_id);
+
+static struct i2c_driver bma150_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = BMA150_DRIVER,
+                .pm     = &bma150_pm,
+        },
+        .class          = I2C_CLASS_HWMON,
+        .id_table       = bma150_id,
+        .probe          = bma150_probe,
+        .remove         = __devexit_p(bma150_remove),
+};
+
+static int __init BMA150_init(void)
+{
+        return i2c_add_driver(&bma150_driver);
+}
+
+static void __exit BMA150_exit(void)
+{
+        i2c_del_driver(&bma150_driver);
+}
+
+MODULE_AUTHOR("Albert Zhang <xu.zhang@bosch-sensortec.com>");
+MODULE_DESCRIPTION("BMA150 driver");
+MODULE_LICENSE("GPL");
+
+module_init(BMA150_init);
+module_exit(BMA150_exit);
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 1f38302a595..302ab46ce75 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -111,7 +111,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
         input_dev->event = ixp4xx_spkr_event;
 
         err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt,
-                          IRQF_DISABLED | IRQF_NO_SUSPEND, "ixp4xx-beeper",
+                          IRQF_NO_SUSPEND, "ixp4xx-beeper",
                           (void *) dev->id);
         if (err)
                 goto err_free_device;
diff --git a/drivers/input/misc/mma8450.c b/drivers/input/misc/mma8450.c
index 0794778295f..4d60080bb5d 100644
--- a/drivers/input/misc/mma8450.c
+++ b/drivers/input/misc/mma8450.c
@@ -88,13 +88,13 @@ static int mma8450_write(struct mma8450 *m, unsigned off, u8 v)
         return 0;
 }
 
-static int mma8450_read_xyz(struct mma8450 *m, int *x, int *y, int *z)
+static int mma8450_read_block(struct mma8450 *m, unsigned off,
+                              u8 *buf, size_t size)
 {
         struct i2c_client *c = m->client;
-        u8 buff[6];
         int err;
 
-        err = i2c_smbus_read_i2c_block_data(c, MMA8450_OUT_X_LSB, 6, buff);
+        err = i2c_smbus_read_i2c_block_data(c, off, size, buf);
         if (err < 0) {
                 dev_err(&c->dev,
                         "failed to read block data at 0x%02x, error %d\n",
@@ -102,10 +102,6 @@ static int mma8450_read_xyz(struct mma8450 *m, int *x, int *y, int *z)
                 return err;
         }
 
-        *x = ((buff[1] << 4) & 0xff0) | (buff[0] & 0xf);
-        *y = ((buff[3] << 4) & 0xff0) | (buff[2] & 0xf);
-        *z = ((buff[5] << 4) & 0xff0) | (buff[4] & 0xf);
-
         return 0;
 }
 
@@ -114,7 +110,7 @@ static void mma8450_poll(struct input_polled_dev *dev)
         struct mma8450 *m = dev->private;
         int x, y, z;
         int ret;
-        int err;
+        u8 buf[6];
 
         ret = mma8450_read(m, MMA8450_STATUS);
         if (ret < 0)
@@ -123,10 +119,14 @@ static void mma8450_poll(struct input_polled_dev *dev)
         if (!(ret & MMA8450_STATUS_ZXYDR))
                 return;
 
-        err = mma8450_read_xyz(m, &x, &y, &z);
-        if (err)
+        ret = mma8450_read_block(m, MMA8450_OUT_X_LSB, buf, sizeof(buf));
+        if (ret < 0)
                 return;
 
+        x = ((buf[1] << 4) & 0xff0) | (buf[0] & 0xf);
+        y = ((buf[3] << 4) & 0xff0) | (buf[2] & 0xf);
+        z = ((buf[5] << 4) & 0xff0) | (buf[4] & 0xf);
+
         input_report_abs(dev->input, ABS_X, x);
         input_report_abs(dev->input, ABS_Y, y);
         input_report_abs(dev->input, ABS_Z, z);
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index f080dd31499..34f4d2e0f50 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -14,6 +14,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/i8253.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
@@ -25,14 +26,6 @@ MODULE_DESCRIPTION("PC Speaker beeper driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:pcspkr");
 
-#if defined(CONFIG_MIPS) || defined(CONFIG_X86)
-/* Use the global PIT lock ! */
-#include <asm/i8253.h>
-#else
-#include <asm/8253pit.h>
-static DEFINE_RAW_SPINLOCK(i8253_lock);
-#endif
-
 static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
         unsigned int count = 0;
diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c
new file mode 100644
index 00000000000..43192930824
--- /dev/null
+++ b/drivers/input/misc/pm8xxx-vibrator.c
@@ -0,0 +1,296 @@
+/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/platform_device.h>
+#include <linux/input.h>
+#include <linux/slab.h>
+#include <linux/mfd/pm8xxx/core.h>
+
+#define VIB_DRV                 0x4A
+
+#define VIB_DRV_SEL_MASK        0xf8
+#define VIB_DRV_SEL_SHIFT       0x03
+#define VIB_DRV_EN_MANUAL_MASK  0xfc
+
+#define VIB_MAX_LEVEL_mV        (3100)
+#define VIB_MIN_LEVEL_mV        (1200)
+#define VIB_MAX_LEVELS          (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV)
+
+#define MAX_FF_SPEED            0xff
+
+/**
+ * struct pm8xxx_vib - structure to hold vibrator data
+ * @vib_input_dev: input device supporting force feedback
+ * @work: work structure to set the vibration parameters
+ * @dev: device supporting force feedback
+ * @speed: speed of vibration set from userland
+ * @active: state of vibrator
+ * @level: level of vibration to set in the chip
+ * @reg_vib_drv: VIB_DRV register value
+ */
+struct pm8xxx_vib {
+        struct input_dev *vib_input_dev;
+        struct work_struct work;
+        struct device *dev;
+        int speed;
+        int level;
+        bool active;
+        u8  reg_vib_drv;
+};
+
+/**
+ * pm8xxx_vib_read_u8 - helper to read a byte from pmic chip
+ * @vib: pointer to vibrator structure
+ * @data: placeholder for data to be read
+ * @reg: register address
+ */
+static int pm8xxx_vib_read_u8(struct pm8xxx_vib *vib,
+                                 u8 *data, u16 reg)
+{
+        int rc;
+
+        rc = pm8xxx_readb(vib->dev->parent, reg, data);
+        if (rc < 0)
+                dev_warn(vib->dev, "Error reading pm8xxx reg 0x%x(0x%x)\n",
+                                reg, rc);
+        return rc;
+}
+
+/**
+ * pm8xxx_vib_write_u8 - helper to write a byte to pmic chip
+ * @vib: pointer to vibrator structure
+ * @data: data to write
+ * @reg: register address
+ */
+static int pm8xxx_vib_write_u8(struct pm8xxx_vib *vib,
+                                 u8 data, u16 reg)
+{
+        int rc;
+
+        rc = pm8xxx_writeb(vib->dev->parent, reg, data);
+        if (rc < 0)
+                dev_warn(vib->dev, "Error writing pm8xxx reg 0x%x(0x%x)\n",
+                                reg, rc);
+        return rc;
+}
+
+/**
+ * pm8xxx_vib_set - handler to start/stop vibration
+ * @vib: pointer to vibrator structure
+ * @on: state to set
+ */
+static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on)
+{
+        int rc;
+        u8 val = vib->reg_vib_drv;
+
+        if (on)
+                val |= ((vib->level << VIB_DRV_SEL_SHIFT) & VIB_DRV_SEL_MASK);
+        else
+                val &= ~VIB_DRV_SEL_MASK;
+
+        rc = pm8xxx_vib_write_u8(vib, val, VIB_DRV);
+        if (rc < 0)
+                return rc;
+
+        vib->reg_vib_drv = val;
+        return 0;
+}
+
+/**
+ * pm8xxx_work_handler - worker to set vibration level
+ * @work: pointer to work_struct
+ */
+static void pm8xxx_work_handler(struct work_struct *work)
+{
+        struct pm8xxx_vib *vib = container_of(work, struct pm8xxx_vib, work);
+        int rc;
+        u8 val;
+
+        rc = pm8xxx_vib_read_u8(vib, &val, VIB_DRV);
+        if (rc < 0)
+                return;
+
+        /*
+         * pmic vibrator supports voltage ranges from 1.2 to 3.1V, so
+         * scale the level to fit into these ranges.
+         */
+        if (vib->speed) {
+                vib->active = true;
+                vib->level = ((VIB_MAX_LEVELS * vib->speed) / MAX_FF_SPEED) +
+                                                VIB_MIN_LEVEL_mV;
+                vib->level /= 100;
+        } else {
+                vib->active = false;
+                vib->level = VIB_MIN_LEVEL_mV / 100;
+        }
+
+        pm8xxx_vib_set(vib, vib->active);
+}
+
+/**
+ * pm8xxx_vib_close - callback of input close callback
+ * @dev: input device pointer
+ *
+ * Turns off the vibrator.
+ */
+static void pm8xxx_vib_close(struct input_dev *dev)
+{
+        struct pm8xxx_vib *vib = input_get_drvdata(dev);
+
+        cancel_work_sync(&vib->work);
+        if (vib->active)
+                pm8xxx_vib_set(vib, false);
+}
+
+/**
+ * pm8xxx_vib_play_effect - function to handle vib effects.
+ * @dev: input device pointer
+ * @data: data of effect
+ * @effect: effect to play
+ *
+ * Currently this driver supports only rumble effects.
+ */
+static int pm8xxx_vib_play_effect(struct input_dev *dev, void *data,
+                                  struct ff_effect *effect)
+{
+        struct pm8xxx_vib *vib = input_get_drvdata(dev);
+
+        vib->speed = effect->u.rumble.strong_magnitude >> 8;
+        if (!vib->speed)
+                vib->speed = effect->u.rumble.weak_magnitude >> 9;
+
+        schedule_work(&vib->work);
+
+        return 0;
+}
+
+static int __devinit pm8xxx_vib_probe(struct platform_device *pdev)
+
+{
+        struct pm8xxx_vib *vib;
+        struct input_dev *input_dev;
+        int error;
+        u8 val;
+
+        vib = kzalloc(sizeof(*vib), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!vib || !input_dev) {
+                dev_err(&pdev->dev, "couldn't allocate memory\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        INIT_WORK(&vib->work, pm8xxx_work_handler);
+        vib->dev = &pdev->dev;
+        vib->vib_input_dev = input_dev;
+
+        /* operate in manual mode */
+        error = pm8xxx_vib_read_u8(vib, &val, VIB_DRV);
+        if (error < 0)
+                goto err_free_mem;
+        val &= ~VIB_DRV_EN_MANUAL_MASK;
+        error = pm8xxx_vib_write_u8(vib, val, VIB_DRV);
+        if (error < 0)
+                goto err_free_mem;
+
+        vib->reg_vib_drv = val;
+
+        input_dev->name = "pm8xxx_vib_ffmemless";
+        input_dev->id.version = 1;
+        input_dev->dev.parent = &pdev->dev;
+        input_dev->close = pm8xxx_vib_close;
+        input_set_drvdata(input_dev, vib);
+        input_set_capability(vib->vib_input_dev, EV_FF, FF_RUMBLE);
+
+        error = input_ff_create_memless(input_dev, NULL,
+                                        pm8xxx_vib_play_effect);
+        if (error) {
+                dev_err(&pdev->dev,
+                        "couldn't register vibrator as FF device\n");
+                goto err_free_mem;
+        }
+
+        error = input_register_device(input_dev);
+        if (error) {
+                dev_err(&pdev->dev, "couldn't register input device\n");
+                goto err_destroy_memless;
+        }
+
+        platform_set_drvdata(pdev, vib);
+        return 0;
+
+err_destroy_memless:
+        input_ff_destroy(input_dev);
+err_free_mem:
+        input_free_device(input_dev);
+        kfree(vib);
+
+        return error;
+}
+
+static int __devexit pm8xxx_vib_remove(struct platform_device *pdev)
+{
+        struct pm8xxx_vib *vib = platform_get_drvdata(pdev);
+
+        input_unregister_device(vib->vib_input_dev);
+        kfree(vib);
+
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int pm8xxx_vib_suspend(struct device *dev)
+{
+        struct pm8xxx_vib *vib = dev_get_drvdata(dev);
+
+        /* Turn off the vibrator */
+        pm8xxx_vib_set(vib, false);
+
+        return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(pm8xxx_vib_pm_ops, pm8xxx_vib_suspend, NULL);
+
+static struct platform_driver pm8xxx_vib_driver = {
+        .probe          = pm8xxx_vib_probe,
+        .remove         = __devexit_p(pm8xxx_vib_remove),
+        .driver         = {
+                .name   = "pm8xxx-vib",
+                .owner  = THIS_MODULE,
+                .pm     = &pm8xxx_vib_pm_ops,
+        },
+};
+
+static int __init pm8xxx_vib_init(void)
+{
+        return platform_driver_register(&pm8xxx_vib_driver);
+}
+module_init(pm8xxx_vib_init);
+
+static void __exit pm8xxx_vib_exit(void)
+{
+        platform_driver_unregister(&pm8xxx_vib_driver);
+}
+module_exit(pm8xxx_vib_exit);
+
+MODULE_ALIAS("platform:pm8xxx_vib");
+MODULE_DESCRIPTION("PMIC8xxx vibrator driver based on ff-memless framework");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Amy Maloche <amaloche@codeaurora.org>");
diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c
index 97e07e786e4..b3cfb9c71e6 100644
--- a/drivers/input/misc/pmic8xxx-pwrkey.c
+++ b/drivers/input/misc/pmic8xxx-pwrkey.c
@@ -90,7 +90,8 @@ static int __devinit pmic8xxx_pwrkey_probe(struct platform_device *pdev)
         unsigned int delay;
         u8 pon_cntl;
         struct pmic8xxx_pwrkey *pwrkey;
-        const struct pm8xxx_pwrkey_platform_data *pdata = mfd_get_data(pdev);
+        const struct pm8xxx_pwrkey_platform_data *pdata =
+                                        dev_get_platdata(&pdev->dev);
 
         if (!pdata) {
                 dev_err(&pdev->dev, "power key platform data not supplied\n");
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index 014dd4ad0d4..3c1a432c14d 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/workqueue.h>
 #include <linux/i2c/twl.h>
-#include <linux/mfd/twl4030-codec.h>
+#include <linux/mfd/twl4030-audio.h>
 #include <linux/input.h>
 #include <linux/slab.h>
 
@@ -67,7 +67,7 @@ static void vibra_enable(struct vibra_info *info)
 {
         u8 reg;
 
-        twl4030_codec_enable_resource(TWL4030_CODEC_RES_POWER);
+        twl4030_audio_enable_resource(TWL4030_AUDIO_RES_POWER);
 
         /* turn H-Bridge on */
         twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE,
@@ -75,7 +75,7 @@ static void vibra_enable(struct vibra_info *info)
         twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
                          (reg | TWL4030_VIBRA_EN), TWL4030_REG_VIBRA_CTL);
 
-        twl4030_codec_enable_resource(TWL4030_CODEC_RES_APLL);
+        twl4030_audio_enable_resource(TWL4030_AUDIO_RES_APLL);
 
         info->enabled = true;
 }
@@ -90,8 +90,8 @@ static void vibra_disable(struct vibra_info *info)
         twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
                          (reg & ~TWL4030_VIBRA_EN), TWL4030_REG_VIBRA_CTL);
 
-        twl4030_codec_disable_resource(TWL4030_CODEC_RES_APLL);
-        twl4030_codec_disable_resource(TWL4030_CODEC_RES_POWER);
+        twl4030_audio_disable_resource(TWL4030_AUDIO_RES_APLL);
+        twl4030_audio_disable_resource(TWL4030_AUDIO_RES_POWER);
 
         info->enabled = false;
 }
@@ -196,7 +196,7 @@ static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
 
 static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
 {
-        struct twl4030_codec_vibra_data *pdata = pdev->dev.platform_data;
+        struct twl4030_vibra_data *pdata = pdev->dev.platform_data;
         struct vibra_info *info;
         int ret;
 
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
new file mode 100644
index 00000000000..23855e12a30
--- /dev/null
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -0,0 +1,423 @@
+/*
+ * twl6040-vibra.c - TWL6040 Vibrator driver
+ *
+ * Author:      Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
+ * Author:      Misael Lopez Cruz <misael.lopez@ti.com>
+ *
+ * Copyright:   (C) 2011 Texas Instruments, Inc.
+ *
+ * Based on twl4030-vibra.c by Henrik Saari <henrik.saari@nokia.com>
+ *                              Felipe Balbi <felipe.balbi@nokia.com>
+ *                              Jari Vanhala <ext-javi.vanhala@nokia.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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/workqueue.h>
+#include <linux/i2c/twl.h>
+#include <linux/mfd/twl6040.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/regulator/consumer.h>
+
+#define EFFECT_DIR_180_DEG      0x8000
+
+/* Recommended modulation index 85% */
+#define TWL6040_VIBRA_MOD       85
+
+#define TWL6040_NUM_SUPPLIES 2
+
+struct vibra_info {
+        struct device *dev;
+        struct input_dev *input_dev;
+        struct workqueue_struct *workqueue;
+        struct work_struct play_work;
+        struct mutex mutex;
+        int irq;
+
+        bool enabled;
+        int weak_speed;
+        int strong_speed;
+        int direction;
+
+        unsigned int vibldrv_res;
+        unsigned int vibrdrv_res;
+        unsigned int viblmotor_res;
+        unsigned int vibrmotor_res;
+
+        struct regulator_bulk_data supplies[TWL6040_NUM_SUPPLIES];
+
+        struct twl6040 *twl6040;
+};
+
+static irqreturn_t twl6040_vib_irq_handler(int irq, void *data)
+{
+        struct vibra_info *info = data;
+        struct twl6040 *twl6040 = info->twl6040;
+        u8 status;
+
+        status = twl6040_reg_read(twl6040, TWL6040_REG_STATUS);
+        if (status & TWL6040_VIBLOCDET) {
+                dev_warn(info->dev, "Left Vibrator overcurrent detected\n");
+                twl6040_clear_bits(twl6040, TWL6040_REG_VIBCTLL,
+                                   TWL6040_VIBENAL);
+        }
+        if (status & TWL6040_VIBROCDET) {
+                dev_warn(info->dev, "Right Vibrator overcurrent detected\n");
+                twl6040_clear_bits(twl6040, TWL6040_REG_VIBCTLR,
+                                   TWL6040_VIBENAR);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static void twl6040_vibra_enable(struct vibra_info *info)
+{
+        struct twl6040 *twl6040 = info->twl6040;
+        int ret;
+
+        ret = regulator_bulk_enable(ARRAY_SIZE(info->supplies), info->supplies);
+        if (ret) {
+                dev_err(info->dev, "failed to enable regulators %d\n", ret);
+                return;
+        }
+
+        twl6040_power(info->twl6040, 1);
+        if (twl6040->rev <= TWL6040_REV_ES1_1) {
+                /*
+                 * ERRATA: Disable overcurrent protection for at least
+                 * 3ms when enabling vibrator drivers to avoid false
+                 * overcurrent detection
+                 */
+                twl6040_reg_write(twl6040, TWL6040_REG_VIBCTLL,
+                                  TWL6040_VIBENAL | TWL6040_VIBCTRLL);
+                twl6040_reg_write(twl6040, TWL6040_REG_VIBCTLR,
+                                  TWL6040_VIBENAR | TWL6040_VIBCTRLR);
+                usleep_range(3000, 3500);
+        }
+
+        twl6040_reg_write(twl6040, TWL6040_REG_VIBCTLL,
+                          TWL6040_VIBENAL);
+        twl6040_reg_write(twl6040, TWL6040_REG_VIBCTLR,
+                          TWL6040_VIBENAR);
+
+        info->enabled = true;
+}
+
+static void twl6040_vibra_disable(struct vibra_info *info)
+{
+        struct twl6040 *twl6040 = info->twl6040;
+
+        twl6040_reg_write(twl6040, TWL6040_REG_VIBCTLL, 0x00);
+        twl6040_reg_write(twl6040, TWL6040_REG_VIBCTLR, 0x00);
+        twl6040_power(info->twl6040, 0);
+
+        regulator_bulk_disable(ARRAY_SIZE(info->supplies), info->supplies);
+
+        info->enabled = false;
+}
+
+static u8 twl6040_vibra_code(int vddvib, int vibdrv_res, int motor_res,
+                             int speed, int direction)
+{
+        int vpk, max_code;
+        u8 vibdat;
+
+        /* output swing */
+        vpk = (vddvib * motor_res * TWL6040_VIBRA_MOD) /
+                (100 * (vibdrv_res + motor_res));
+
+        /* 50mV per VIBDAT code step */
+        max_code = vpk / 50;
+        if (max_code > TWL6040_VIBDAT_MAX)
+                max_code = TWL6040_VIBDAT_MAX;
+
+        /* scale speed to max allowed code */
+        vibdat = (u8)((speed * max_code) / USHRT_MAX);
+
+        /* 2's complement for direction > 180 degrees */
+        vibdat *= direction;
+
+        return vibdat;
+}
+
+static void twl6040_vibra_set_effect(struct vibra_info *info)
+{
+        struct twl6040 *twl6040 = info->twl6040;
+        u8 vibdatl, vibdatr;
+        int volt;
+
+        /* weak motor */
+        volt = regulator_get_voltage(info->supplies[0].consumer) / 1000;
+        vibdatl = twl6040_vibra_code(volt, info->vibldrv_res,
+                                     info->viblmotor_res,
+                                     info->weak_speed, info->direction);
+
+        /* strong motor */
+        volt = regulator_get_voltage(info->supplies[1].consumer) / 1000;
+        vibdatr = twl6040_vibra_code(volt, info->vibrdrv_res,
+                                     info->vibrmotor_res,
+                                     info->strong_speed, info->direction);
+
+        twl6040_reg_write(twl6040, TWL6040_REG_VIBDATL, vibdatl);
+        twl6040_reg_write(twl6040, TWL6040_REG_VIBDATR, vibdatr);
+}
+
+static void vibra_play_work(struct work_struct *work)
+{
+        struct vibra_info *info = container_of(work,
+                                struct vibra_info, play_work);
+
+        mutex_lock(&info->mutex);
+
+        if (info->weak_speed || info->strong_speed) {
+                if (!info->enabled)
+                        twl6040_vibra_enable(info);
+
+                twl6040_vibra_set_effect(info);
+        } else if (info->enabled)
+                twl6040_vibra_disable(info);
+
+        mutex_unlock(&info->mutex);
+}
+
+static int vibra_play(struct input_dev *input, void *data,
+                      struct ff_effect *effect)
+{
+        struct vibra_info *info = input_get_drvdata(input);
+        int ret;
+
+        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;
+        }
+
+        return 0;
+}
+
+static void twl6040_vibra_close(struct input_dev *input)
+{
+        struct vibra_info *info = input_get_drvdata(input);
+
+        cancel_work_sync(&info->play_work);
+
+        mutex_lock(&info->mutex);
+
+        if (info->enabled)
+                twl6040_vibra_disable(info);
+
+        mutex_unlock(&info->mutex);
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int twl6040_vibra_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct vibra_info *info = platform_get_drvdata(pdev);
+
+        mutex_lock(&info->mutex);
+
+        if (info->enabled)
+                twl6040_vibra_disable(info);
+
+        mutex_unlock(&info->mutex);
+
+        return 0;
+}
+
+#endif
+
+static SIMPLE_DEV_PM_OPS(twl6040_vibra_pm_ops, twl6040_vibra_suspend, NULL);
+
+static int __devinit twl6040_vibra_probe(struct platform_device *pdev)
+{
+        struct twl4030_vibra_data *pdata = pdev->dev.platform_data;
+        struct vibra_info *info;
+        int ret;
+
+        if (!pdata) {
+                dev_err(&pdev->dev, "platform_data not available\n");
+                return -EINVAL;
+        }
+
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        if (!info) {
+                dev_err(&pdev->dev, "couldn't allocate memory\n");
+                return -ENOMEM;
+        }
+
+        info->dev = &pdev->dev;
+        info->twl6040 = dev_get_drvdata(pdev->dev.parent);
+        info->vibldrv_res = pdata->vibldrv_res;
+        info->vibrdrv_res = pdata->vibrdrv_res;
+        info->viblmotor_res = pdata->viblmotor_res;
+        info->vibrmotor_res = pdata->vibrmotor_res;
+        if ((!info->vibldrv_res && !info->viblmotor_res) ||
+            (!info->vibrdrv_res && !info->vibrmotor_res)) {
+                dev_err(info->dev, "invalid vibra driver/motor resistance\n");
+                ret = -EINVAL;
+                goto err_kzalloc;
+        }
+
+        info->irq = platform_get_irq(pdev, 0);
+        if (info->irq < 0) {
+                dev_err(info->dev, "invalid irq\n");
+                ret = -EINVAL;
+                goto err_kzalloc;
+        }
+
+        mutex_init(&info->mutex);
+
+        info->input_dev = input_allocate_device();
+        if (info->input_dev == NULL) {
+                dev_err(info->dev, "couldn't allocate input device\n");
+                ret = -ENOMEM;
+                goto err_kzalloc;
+        }
+
+        input_set_drvdata(info->input_dev, info);
+
+        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);
+
+        ret = input_ff_create_memless(info->input_dev, NULL, vibra_play);
+        if (ret < 0) {
+                dev_err(info->dev, "couldn't register vibrator to FF\n");
+                goto err_ialloc;
+        }
+
+        ret = input_register_device(info->input_dev);
+        if (ret < 0) {
+                dev_err(info->dev, "couldn't register input device\n");
+                goto err_iff;
+        }
+
+        platform_set_drvdata(pdev, info);
+
+        ret = request_threaded_irq(info->irq, NULL, twl6040_vib_irq_handler, 0,
+                                   "twl6040_irq_vib", info);
+        if (ret) {
+                dev_err(info->dev, "VIB IRQ request failed: %d\n", ret);
+                goto err_irq;
+        }
+
+        info->supplies[0].supply = "vddvibl";
+        info->supplies[1].supply = "vddvibr";
+        ret = regulator_bulk_get(info->dev, ARRAY_SIZE(info->supplies),
+                                 info->supplies);
+        if (ret) {
+                dev_err(info->dev, "couldn't get regulators %d\n", ret);
+                goto err_regulator;
+        }
+
+        if (pdata->vddvibl_uV) {
+                ret = regulator_set_voltage(info->supplies[0].consumer,
+                                            pdata->vddvibl_uV,
+                                            pdata->vddvibl_uV);
+                if (ret) {
+                        dev_err(info->dev, "failed to set VDDVIBL volt %d\n",
+                                ret);
+                        goto err_voltage;
+                }
+        }
+
+        if (pdata->vddvibr_uV) {
+                ret = regulator_set_voltage(info->supplies[1].consumer,
+                                            pdata->vddvibr_uV,
+                                            pdata->vddvibr_uV);
+                if (ret) {
+                        dev_err(info->dev, "failed to set VDDVIBR volt %d\n",
+                                ret);
+                        goto err_voltage;
+                }
+        }
+
+        info->workqueue = alloc_workqueue("twl6040-vibra", 0, 0);
+        if (info->workqueue == NULL) {
+                dev_err(info->dev, "couldn't create workqueue\n");
+                ret = -ENOMEM;
+                goto err_voltage;
+        }
+        INIT_WORK(&info->play_work, vibra_play_work);
+
+        return 0;
+
+err_voltage:
+        regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies);
+err_regulator:
+        free_irq(info->irq, info);
+err_irq:
+        input_unregister_device(info->input_dev);
+        info->input_dev = NULL;
+err_iff:
+        if (info->input_dev)
+                input_ff_destroy(info->input_dev);
+err_ialloc:
+        input_free_device(info->input_dev);
+err_kzalloc:
+        kfree(info);
+        return ret;
+}
+
+static int __devexit twl6040_vibra_remove(struct platform_device *pdev)
+{
+        struct vibra_info *info = platform_get_drvdata(pdev);
+
+        input_unregister_device(info->input_dev);
+        free_irq(info->irq, info);
+        regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies);
+        destroy_workqueue(info->workqueue);
+        kfree(info);
+
+        return 0;
+}
+
+static struct platform_driver twl6040_vibra_driver = {
+        .probe          = twl6040_vibra_probe,
+        .remove         = __devexit_p(twl6040_vibra_remove),
+        .driver         = {
+                .name   = "twl6040-vibra",
+                .owner  = THIS_MODULE,
+                .pm     = &twl6040_vibra_pm_ops,
+        },
+};
+
+static int __init twl6040_vibra_init(void)
+{
+        return platform_driver_register(&twl6040_vibra_driver);
+}
+module_init(twl6040_vibra_init);
+
+static void __exit twl6040_vibra_exit(void)
+{
+        platform_driver_unregister(&twl6040_vibra_driver);
+}
+module_exit(twl6040_vibra_exit);
+
+MODULE_ALIAS("platform:twl6040-vibra");
+MODULE_DESCRIPTION("TWL6040 Vibra driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jorge Eduardo Candelaria <jorge.candelaria@ti.com>");
+MODULE_AUTHOR("Misael Lopez Cruz <misael.lopez@ti.com>");