Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input layer updates from Dmitry Torokhov:
 - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics
   Navpoint, LM8333 keypads, Wacom I2C touhscreen);
 - updates to existing touchpad drivers (ALPS, Sntelic);
 - Wacom driver now supports Intuos5;
 - device-tree bindings in numerous drivers;
 - other cleanups and fixes.

Fix annoying conflict in drivers/input/tablet/wacom_wac.c that I think
implies that the input layer device naming is broken, but let's see.  I
brough it up with Dmitry.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  Input: matrix-keymap - fix building keymaps
  Input: spear-keyboard - document DT bindings
  Input: spear-keyboard - add device tree bindings
  Input: matrix-keymap - wire up device tree support
  Input: matrix-keymap - uninline and prepare for device tree support
  Input: adp5588 - add support for gpio names
  Input: omap-keypad - dynamically handle register offsets
  Input: synaptics - fix compile warning
  MAINTAINERS: adjust input-related patterns
  Input: ALPS - switch to using input_mt_report_finger_count
  Input: ALPS - add semi-MT support for v4 protocol
  Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver
  Input: atmel_mxt_ts - dump each message on just 1 line
  Input: atmel_mxt_ts - do not read extra (checksum) byte
  Input: atmel_mxt_ts - verify object size in mxt_write_object
  Input: atmel_mxt_ts - only allow root to update firmware
  Input: atmel_mxt_ts - use CONFIG_PM_SLEEP
  Input: sentelic - report device's production serial number
  Input: tl6040-vibra - Device Tree support
  Input: evdev - properly handle read/write with count 0
  ...

3 files changed, 37 insertions, 13 deletions

diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c
index 06517e60e50c..a3735a01e9fd 100644
--- a/drivers/input/misc/cma3000_d0x.c
+++ b/drivers/input/misc/cma3000_d0x.c
@@ -318,7 +318,7 @@ struct cma3000_accl_data *cma3000_init(struct device *dev, int irq,
         mutex_init(&data->mutex);
 
         data->mode = pdata->mode;
-        if (data->mode < CMAMODE_DEFAULT || data->mode > CMAMODE_POFF) {
+        if (data->mode > CMAMODE_POFF) {
                 data->mode = CMAMODE_MOTDET;
                 dev_warn(dev,
                          "Invalid mode specified, assuming Motion Detect\n");
diff --git a/drivers/input/misc/mpu3050.c b/drivers/input/misc/mpu3050.c
index 5403c571b6a5..306f84c2d8fb 100644
--- a/drivers/input/misc/mpu3050.c
+++ b/drivers/input/misc/mpu3050.c
@@ -367,7 +367,7 @@ static int __devinit mpu3050_probe(struct i2c_client *client,
 
         error = request_threaded_irq(client->irq,
                                      NULL, mpu3050_interrupt_thread,
-                                     IRQF_TRIGGER_RISING,
+                                     IRQF_TRIGGER_RISING | IRQF_ONESHOT,
                                      "mpu3050", sensor);
         if (error) {
                 dev_err(&client->dev,
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index 14e94f56cb7d..c34f6c0371c4 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -27,6 +27,7 @@
  */
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/workqueue.h>
 #include <linux/input.h>
 #include <linux/mfd/twl6040.h>
@@ -258,10 +259,13 @@ static SIMPLE_DEV_PM_OPS(twl6040_vibra_pm_ops, twl6040_vibra_suspend, NULL);
 static int __devinit twl6040_vibra_probe(struct platform_device *pdev)
 {
         struct twl6040_vibra_data *pdata = pdev->dev.platform_data;
+        struct device_node *node = pdev->dev.of_node;
         struct vibra_info *info;
+        int vddvibl_uV = 0;
+        int vddvibr_uV = 0;
         int ret;
 
-        if (!pdata) {
+        if (!pdata && !node) {
                 dev_err(&pdev->dev, "platform_data not available\n");
                 return -EINVAL;
         }
@@ -273,11 +277,26 @@ static int __devinit twl6040_vibra_probe(struct platform_device *pdev)
         }
 
         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 (pdata) {
+                info->vibldrv_res = pdata->vibldrv_res;
+                info->vibrdrv_res = pdata->vibrdrv_res;
+                info->viblmotor_res = pdata->viblmotor_res;
+                info->vibrmotor_res = pdata->vibrmotor_res;
+                vddvibl_uV = pdata->vddvibl_uV;
+                vddvibr_uV = pdata->vddvibr_uV;
+        } else {
+                of_property_read_u32(node, "vibldrv_res", &info->vibldrv_res);
+                of_property_read_u32(node, "vibrdrv_res", &info->vibrdrv_res);
+                of_property_read_u32(node, "viblmotor_res",
+                                     &info->viblmotor_res);
+                of_property_read_u32(node, "vibrmotor_res",
+                                     &info->vibrmotor_res);
+                of_property_read_u32(node, "vddvibl_uV", &vddvibl_uV);
+                of_property_read_u32(node, "vddvibr_uV", &vddvibr_uV);
+        }
+
         if ((!info->vibldrv_res && !info->viblmotor_res) ||
             (!info->vibrdrv_res && !info->vibrmotor_res)) {
                 dev_err(info->dev, "invalid vibra driver/motor resistance\n");
@@ -339,10 +358,9 @@ static int __devinit twl6040_vibra_probe(struct platform_device *pdev)
                 goto err_regulator;
         }
 
-        if (pdata->vddvibl_uV) {
+        if (vddvibl_uV) {
                 ret = regulator_set_voltage(info->supplies[0].consumer,
-                                            pdata->vddvibl_uV,
-                                            pdata->vddvibl_uV);
+                                            vddvibl_uV, vddvibl_uV);
                 if (ret) {
                         dev_err(info->dev, "failed to set VDDVIBL volt %d\n",
                                 ret);
@@ -350,10 +368,9 @@ static int __devinit twl6040_vibra_probe(struct platform_device *pdev)
                 }
         }
 
-        if (pdata->vddvibr_uV) {
+        if (vddvibr_uV) {
                 ret = regulator_set_voltage(info->supplies[1].consumer,
-                                            pdata->vddvibr_uV,
-                                            pdata->vddvibr_uV);
+                                            vddvibr_uV, vddvibr_uV);
                 if (ret) {
                         dev_err(info->dev, "failed to set VDDVIBR volt %d\n",
                                 ret);
@@ -401,6 +418,12 @@ static int __devexit twl6040_vibra_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct of_device_id twl6040_vibra_of_match[] = {
+        {.compatible = "ti,twl6040-vibra", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, twl6040_vibra_of_match);
+
 static struct platform_driver twl6040_vibra_driver = {
         .probe          = twl6040_vibra_probe,
         .remove         = __devexit_p(twl6040_vibra_remove),
@@ -408,6 +431,7 @@ static struct platform_driver twl6040_vibra_driver = {
                 .name   = "twl6040-vibra",
                 .owner  = THIS_MODULE,
                 .pm     = &twl6040_vibra_pm_ops,
+                .of_match_table = twl6040_vibra_of_match,
         },
 };
 module_platform_driver(twl6040_vibra_driver);