Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Pull MFD changes from Samuel Ortiz:
 "MFD bits for the 3.7 merge window.

  As usual we have a few new drivers:

   - TI LP8788
   - TI OMAP USB TLL
   - Maxim MAX8907
   - SMSC ECE1099
   - Dialog Semiconductor DA9055
   - A simpler syscon driver that allow us to get rid of the anatop one.

  Drivers are also gradually getting Device Tree and IRQ domain support.

  The following drivers got DT support:
   - palmas, 88pm860x, tc3589x and twl4030-audio

  And those ones now use the IRQ domain APIs:
   - 88pm860x, tc3589x, db8500_prcmu

  Also some other interesting changes:
   - Intel's ICH LPC now supports Lynx Point
   - TI's twl4030-audio added a GPO child
   - tps6527 enabled its backlight subdevice
   - The twl6030 pwm driver moved to the new PWM subsystem

  And finally a bunch of cleanup and casual fixes for mc13xxx, 88pm860x,
  palmas, ab8500, wm8994, wm5110, max8907 and the tps65xxx family."

Fix up various annoying conflicts: the DT and IRQ domain support came in
twice and was already in 3.6. And then it was apparently rebased.

Guys, DON'T REBASE!

* tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (89 commits)
  ARM: dts: Enable 88pm860x pmic
  mfd: 88pm860x: Move gpadc init into touch
  mfd: 88pm860x: Device tree support
  mfd: 88pm860x: Use irqdomain
  mfd: smsc: Add support for smsc gpio io/keypad driver
  backlight: tps65217_bl: Add missing platform_set_drvdata in tps65217_bl_probe
  mfd: DA9055 core driver
  mfd: tps65910: Add alarm interrupt of TPS65910 RTC to mfd device list
  mfd: wm5110: Add register patches for revision B
  mfd: wm5110: Disable control interface error report for WM5110 rev B
  mfd: max8907: Remove regulator-compatible from DT docs
  backlight: Add TPS65217 WLED driver
  mfd: Add backlight as subdevice to the tps65217
  mfd: Provide the PRCMU with its own IRQ domain
  mfd: Fix max8907 sparse warning
  mfd: Add lp8788 mfd driver
  mfd: dbx500: Provide a more accurate smp_twd clock
  mfd: rc5t583: Fix warning messages
  regulator: palmas: Add DT support
  mfd: palmas: Change regulator defns to better suite DT
  ...

2 files changed, 127 insertions, 18 deletions

diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index fc0ed9b43424..2194a3c7236a 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/jiffies.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/workqueue.h>
 #include <linux/i2c/twl.h>
 #include <linux/mfd/twl4030-audio.h>
@@ -194,13 +195,26 @@ static int twl4030_vibra_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
                          twl4030_vibra_suspend, twl4030_vibra_resume);
 
+static bool twl4030_vibra_check_coexist(struct twl4030_vibra_data *pdata,
+                              struct device_node *node)
+{
+        if (pdata && pdata->coexist)
+                return true;
+
+        if (of_find_node_by_name(node, "codec"))
+                return true;
+
+        return false;
+}
+
 static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
 {
         struct twl4030_vibra_data *pdata = pdev->dev.platform_data;
+        struct device_node *twl4030_core_node = pdev->dev.parent->of_node;
         struct vibra_info *info;
         int ret;
 
-        if (!pdata) {
+        if (!pdata && !twl4030_core_node) {
                 dev_dbg(&pdev->dev, "platform_data not available\n");
                 return -EINVAL;
         }
@@ -210,7 +224,7 @@ static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         info->dev = &pdev->dev;
-        info->coexist = pdata->coexist;
+        info->coexist = twl4030_vibra_check_coexist(pdata, twl4030_core_node);
         INIT_WORK(&info->play_work, vibra_play_work);
 
         info->input_dev = input_allocate_device();
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,