Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

5 files changed, 160 insertions, 22 deletions

diff --git a/drivers/input/touchscreen/88pm860x-ts.c b/drivers/input/touchscreen/88pm860x-ts.c
index 05f30b73c3c3..326218dbd6e6 100644
--- a/drivers/input/touchscreen/88pm860x-ts.c
+++ b/drivers/input/touchscreen/88pm860x-ts.c
@@ -10,6 +10,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 #include <linux/input.h>
@@ -113,14 +114,69 @@ static void pm860x_touch_close(struct input_dev *dev)
         pm860x_set_bits(touch->i2c, MEAS_EN3, data, 0);
 }
 
+#ifdef CONFIG_OF
+static int __devinit pm860x_touch_dt_init(struct platform_device *pdev,
+                                          struct pm860x_chip *chip,
+                                          int *res_x)
+{
+        struct device_node *np = pdev->dev.parent->of_node;
+        struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \
+                                 : chip->companion;
+        int data, n, ret;
+        if (!np)
+                return -ENODEV;
+        np = of_find_node_by_name(np, "touch");
+        if (!np) {
+                dev_err(&pdev->dev, "Can't find touch node\n");
+                return -EINVAL;
+        }
+        /* set GPADC MISC1 register */
+        data = 0;
+        if (!of_property_read_u32(np, "marvell,88pm860x-gpadc-prebias", &n))
+                data |= (n << 1) & PM8607_GPADC_PREBIAS_MASK;
+        if (!of_property_read_u32(np, "marvell,88pm860x-gpadc-slot-cycle", &n))
+                data |= (n << 3) & PM8607_GPADC_SLOT_CYCLE_MASK;
+        if (!of_property_read_u32(np, "marvell,88pm860x-gpadc-off-scale", &n))
+                data |= (n << 5) & PM8607_GPADC_OFF_SCALE_MASK;
+        if (!of_property_read_u32(np, "marvell,88pm860x-gpadc-sw-cal", &n))
+                data |= (n << 7) & PM8607_GPADC_SW_CAL_MASK;
+        if (data) {
+                ret = pm860x_reg_write(i2c, PM8607_GPADC_MISC1, data);
+                if (ret < 0)
+                        return -EINVAL;
+        }
+        /* set tsi prebias time */
+        if (!of_property_read_u32(np, "marvell,88pm860x-tsi-prebias", &data)) {
+                ret = pm860x_reg_write(i2c, PM8607_TSI_PREBIAS, data);
+                if (ret < 0)
+                        return -EINVAL;
+        }
+        /* set prebias & prechg time of pen detect */
+        data = 0;
+        if (!of_property_read_u32(np, "marvell,88pm860x-pen-prebias", &n))
+                data |= n & PM8607_PD_PREBIAS_MASK;
+        if (!of_property_read_u32(np, "marvell,88pm860x-pen-prechg", &n))
+                data |= n & PM8607_PD_PRECHG_MASK;
+        if (data) {
+                ret = pm860x_reg_write(i2c, PM8607_PD_PREBIAS, data);
+                if (ret < 0)
+                        return -EINVAL;
+        }
+        of_property_read_u32(np, "marvell,88pm860x-resistor-X", res_x);
+        return 0;
+}
+#else
+#define pm860x_touch_dt_init(x, y, z)   (-1)
+#endif
+
 static int __devinit pm860x_touch_probe(struct platform_device *pdev)
 {
         struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
-        struct pm860x_platform_data *pm860x_pdata =             \
-                                pdev->dev.parent->platform_data;
-        struct pm860x_touch_pdata *pdata = NULL;
+        struct pm860x_touch_pdata *pdata = pdev->dev.platform_data;
         struct pm860x_touch *touch;
-        int irq, ret;
+        struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \
+                                 : chip->companion;
+        int irq, ret, res_x = 0, data = 0;
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
@@ -128,16 +184,55 @@ static int __devinit pm860x_touch_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        if (!pm860x_pdata) {
-                dev_err(&pdev->dev, "platform data is missing\n");
-                return -EINVAL;
-        }
-
-        pdata = pm860x_pdata->touch;
-        if (!pdata) {
-                dev_err(&pdev->dev, "touchscreen data is missing\n");
-                return -EINVAL;
+        if (pm860x_touch_dt_init(pdev, chip, &res_x)) {
+                if (pdata) {
+                        /* set GPADC MISC1 register */
+                        data = 0;
+                        data |= (pdata->gpadc_prebias << 1)
+                                & PM8607_GPADC_PREBIAS_MASK;
+                        data |= (pdata->slot_cycle << 3)
+                                & PM8607_GPADC_SLOT_CYCLE_MASK;
+                        data |= (pdata->off_scale << 5)
+                                & PM8607_GPADC_OFF_SCALE_MASK;
+                        data |= (pdata->sw_cal << 7)
+                                & PM8607_GPADC_SW_CAL_MASK;
+                        if (data) {
+                                ret = pm860x_reg_write(i2c,
+                                        PM8607_GPADC_MISC1, data);
+                                if (ret < 0)
+                                        return -EINVAL;
+                        }
+                        /* set tsi prebias time */
+                        if (pdata->tsi_prebias) {
+                                data = pdata->tsi_prebias;
+                                ret = pm860x_reg_write(i2c,
+                                        PM8607_TSI_PREBIAS, data);
+                                if (ret < 0)
+                                        return -EINVAL;
+                        }
+                        /* set prebias & prechg time of pen detect */
+                        data = 0;
+                        data |= pdata->pen_prebias
+                                & PM8607_PD_PREBIAS_MASK;
+                        data |= (pdata->pen_prechg << 5)
+                                & PM8607_PD_PRECHG_MASK;
+                        if (data) {
+                                ret = pm860x_reg_write(i2c,
+                                        PM8607_PD_PREBIAS, data);
+                                if (ret < 0)
+                                        return -EINVAL;
+                        }
+                        res_x = pdata->res_x;
+                } else {
+                        dev_err(&pdev->dev, "failed to get platform data\n");
+                        return -EINVAL;
+                }
         }
+        /* enable GPADC */
+        ret = pm860x_set_bits(i2c, PM8607_GPADC_MISC1, PM8607_GPADC_EN,
+                              PM8607_GPADC_EN);
+        if (ret)
+                return ret;
 
         touch = kzalloc(sizeof(struct pm860x_touch), GFP_KERNEL);
         if (touch == NULL)
@@ -158,9 +253,9 @@ static int __devinit pm860x_touch_probe(struct platform_device *pdev)
         touch->idev->open = pm860x_touch_open;
         touch->idev->close = pm860x_touch_close;
         touch->chip = chip;
-        touch->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;
-        touch->irq = irq + chip->irq_base;
-        touch->res_x = pdata->res_x;
+        touch->i2c = i2c;
+        touch->irq = irq;
+        touch->res_x = res_x;
         input_set_drvdata(touch->idev, touch);
 
         ret = request_threaded_irq(touch->irq, NULL, pm860x_touch_handler,
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index bcaea7a5e02b..d9c6007e445f 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -558,9 +558,12 @@ static ssize_t edt_ft5x06_debugfs_raw_data_read(struct file *file,
         }
 
         read = min_t(size_t, count, tsdata->raw_bufsize - *off);
-        error = copy_to_user(buf, tsdata->raw_buffer + *off, read);
-        if (!error)
-                *off += read;
+        if (copy_to_user(buf, tsdata->raw_buffer + *off, read)) {
+                error = -EFAULT;
+                goto out;
+        }
+
+        *off += read;
 out:
         mutex_unlock(&tsdata->mutex);
         return error ?: read;
@@ -594,6 +597,7 @@ edt_ft5x06_ts_teardown_debugfs(struct edt_ft5x06_ts_data *tsdata)
 {
         if (tsdata->debug_dir)
                 debugfs_remove_recursive(tsdata->debug_dir);
+        kfree(tsdata->raw_buffer);
 }
 
 #else
@@ -835,7 +839,6 @@ static int __devexit edt_ft5x06_ts_remove(struct i2c_client *client)
         if (gpio_is_valid(pdata->reset_pin))
                 gpio_free(pdata->reset_pin);
 
-        kfree(tsdata->raw_buffer);
         kfree(tsdata);
 
         return 0;
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index b3c66d4d02f6..549fa29548f8 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -37,7 +37,7 @@
 
 #include <plat/adc.h>
 #include <plat/regs-adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
 
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index e32709e0dd65..721fdb3597ca 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -304,6 +304,45 @@ static int e2i_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 #define EGALAX_PKT_TYPE_REPT            0x80
 #define EGALAX_PKT_TYPE_DIAG            0x0A
 
+static int egalax_init(struct usbtouch_usb *usbtouch)
+{
+        int ret, i;
+        unsigned char *buf;
+        struct usb_device *udev = interface_to_usbdev(usbtouch->interface);
+
+        /*
+         * An eGalax diagnostic packet kicks the device into using the right
+         * protocol.  We send a "check active" packet.  The response will be
+         * read later and ignored.
+         */
+
+        buf = kmalloc(3, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        buf[0] = EGALAX_PKT_TYPE_DIAG;
+        buf[1] = 1;     /* length */
+        buf[2] = 'A';   /* command - check active */
+
+        for (i = 0; i < 3; i++) {
+                ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                                      0,
+                                      USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                                      0, 0, buf, 3,
+                                      USB_CTRL_SET_TIMEOUT);
+                if (ret >= 0) {
+                        ret = 0;
+                        break;
+                }
+                if (ret != -EPIPE)
+                        break;
+        }
+
+        kfree(buf);
+
+        return ret;
+}
+
 static int egalax_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
         if ((pkt[0] & EGALAX_PKT_TYPE_MASK) != EGALAX_PKT_TYPE_REPT)
@@ -1056,6 +1095,7 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
                 .process_pkt    = usbtouch_process_multi,
                 .get_pkt_len    = egalax_get_pkt_len,
                 .read_data      = egalax_read_data,
+                .init           = egalax_init,
         },
 #endif
 
diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
index 362f78d4507f..c7eee56d0087 100644
--- a/drivers/input/touchscreen/wm831x-ts.c
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -221,7 +221,7 @@ static void wm831x_ts_input_close(struct input_dev *idev)
         synchronize_irq(wm831x_ts->pd_irq);
 
         /* Make sure the IRQ completion work is quiesced */
-        flush_work_sync(&wm831x_ts->pd_data_work);
+        flush_work(&wm831x_ts->pd_data_work);
 
         /* If we ended up with the pen down then make sure we revert back
          * to pen detection state for the next time we start up.