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

Pull MFD bits from Samuel Ortiz:
 "We have support for a few new drivers:
   - Samsung s2mps11
   - Wolfson Microelectronics wm5102 and wm5110
   - Marvell 88PM800 and 88PM805
   - TI twl6041

  We also have our regular driver improvements:
   - Device tree and IRQ domain support for STE AB8500
   - Regmap and devm_* API conversion for TI tps6586x
   - Device tree support for Samsung max77686
   - devm_* API conversion for STE AB3100

  Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
  tps65090, da9052 and twl-core."

Fix up mostly trivial conflicts, with the exception of
drivers/usb/host/ehci-omap.c in particular, which had some
re-organization of the reset sequence (commit 1a49e2ac9651: "EHCI:
centralize controller initialization") that clashed with commit
2761a6394516 ("mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix
issues").

In particular, commit 2761a6394516 moved the usb_add_hcd() to the
*middle* of the reset sequence, which clashes fairly badly with the
reset sequence re-organization (although it could have been done inside
the new omap_ehci_init() function).

I left that part of commit 2761a6394516 just undone.

* tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (110 commits)
  mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core
  mfd: Arizone core should select MFD_CORE
  mfd: Fix arizona-irq.c build by selecting REGMAP_IRQ
  mfd: Add debug trace on entering and leaving arizone runtime suspend
  mfd: Correct tps65090 cell names
  mfd: Remove gpio support from tps6586x core driver
  ARM: tegra: defconfig: Enable tps6586x gpio
  gpio: tps6586x: Add gpio support through platform driver
  mfd: Cache tps6586x register through regmap
  mfd: Use regmap for tps6586x register access.
  mfd: Use devm managed resources for tps6586x
  input: Add onkey support for 88PM80X PMIC
  mfd: Add support for twl6041
  mfd: Fix twl6040 revision information
  mfd: Matches should be NULL when populate anatop child devices
  input: ab8500-ponkey: Create AB8500 domain IRQ mapping
  mfd: Add missing out of memory check for pcf50633
  Documentation: Describe the AB8500 Device Tree bindings
  mfd: Add tps65910 32-kHz-crystal-input init
  mfd: Drop modifying mc13xxx driver's id_table in probe
  ...

4 files changed, 181 insertions, 2 deletions

diff --git a/drivers/input/misc/88pm80x_onkey.c b/drivers/input/misc/88pm80x_onkey.c
new file mode 100644
index 000000000000..7f26e7b6c228
--- /dev/null
+++ b/drivers/input/misc/88pm80x_onkey.c
@@ -0,0 +1,168 @@
+/*
+ * Marvell 88PM80x ONKEY driver
+ *
+ * Copyright (C) 2012 Marvell International Ltd.
+ * Haojian Zhuang <haojian.zhuang@marvell.com>
+ * Qiao Zhou <zhouqiao@marvell.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License. See the file "COPYING" in the main directory of this
+ * archive for more details.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/input.h>
+#include <linux/mfd/88pm80x.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+#define PM800_LONG_ONKEY_EN             (1 << 0)
+#define PM800_LONG_KEY_DELAY            (8)     /* 1 .. 16 seconds */
+#define PM800_LONKEY_PRESS_TIME         ((PM800_LONG_KEY_DELAY-1) << 4)
+#define PM800_LONKEY_PRESS_TIME_MASK    (0xF0)
+#define PM800_SW_PDOWN                  (1 << 5)
+
+struct pm80x_onkey_info {
+        struct input_dev *idev;
+        struct pm80x_chip *pm80x;
+        struct regmap *map;
+        int irq;
+};
+
+/* 88PM80x gives us an interrupt when ONKEY is held */
+static irqreturn_t pm80x_onkey_handler(int irq, void *data)
+{
+        struct pm80x_onkey_info *info = data;
+        int ret = 0;
+        unsigned int val;
+
+        ret = regmap_read(info->map, PM800_STATUS_1, &val);
+        if (ret < 0) {
+                dev_err(info->idev->dev.parent, "failed to read status: %d\n", ret);
+                return IRQ_NONE;
+        }
+        val &= PM800_ONKEY_STS1;
+
+        input_report_key(info->idev, KEY_POWER, val);
+        input_sync(info->idev);
+
+        return IRQ_HANDLED;
+}
+
+static SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend,
+                         pm80x_dev_resume);
+
+static int __devinit pm80x_onkey_probe(struct platform_device *pdev)
+{
+
+        struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);
+        struct pm80x_onkey_info *info;
+        int err;
+
+        info = kzalloc(sizeof(struct pm80x_onkey_info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        info->pm80x = chip;
+
+        info->irq = platform_get_irq(pdev, 0);
+        if (info->irq < 0) {
+                dev_err(&pdev->dev, "No IRQ resource!\n");
+                err = -EINVAL;
+                goto out;
+        }
+
+        info->map = info->pm80x->regmap;
+        if (!info->map) {
+                dev_err(&pdev->dev, "no regmap!\n");
+                err = -EINVAL;
+                goto out;
+        }
+
+        info->idev = input_allocate_device();
+        if (!info->idev) {
+                dev_err(&pdev->dev, "Failed to allocate input dev\n");
+                err = -ENOMEM;
+                goto out;
+        }
+
+        info->idev->name = "88pm80x_on";
+        info->idev->phys = "88pm80x_on/input0";
+        info->idev->id.bustype = BUS_I2C;
+        info->idev->dev.parent = &pdev->dev;
+        info->idev->evbit[0] = BIT_MASK(EV_KEY);
+        __set_bit(KEY_POWER, info->idev->keybit);
+
+        err = pm80x_request_irq(info->pm80x, info->irq, pm80x_onkey_handler,
+                                            IRQF_ONESHOT, "onkey", info);
+        if (err < 0) {
+                dev_err(&pdev->dev, "Failed to request IRQ: #%d: %d\n",
+                        info->irq, err);
+                goto out_reg;
+        }
+
+        err = input_register_device(info->idev);
+        if (err) {
+                dev_err(&pdev->dev, "Can't register input device: %d\n", err);
+                goto out_irq;
+        }
+
+        platform_set_drvdata(pdev, info);
+
+        /* Enable long onkey detection */
+        regmap_update_bits(info->map, PM800_RTC_MISC4, PM800_LONG_ONKEY_EN,
+                           PM800_LONG_ONKEY_EN);
+        /* Set 8-second interval */
+        regmap_update_bits(info->map, PM800_RTC_MISC3,
+                           PM800_LONKEY_PRESS_TIME_MASK,
+                           PM800_LONKEY_PRESS_TIME);
+
+        device_init_wakeup(&pdev->dev, 1);
+        return 0;
+
+out_irq:
+        pm80x_free_irq(info->pm80x, info->irq, info);
+out_reg:
+        input_free_device(info->idev);
+out:
+        kfree(info);
+        return err;
+}
+
+static int __devexit pm80x_onkey_remove(struct platform_device *pdev)
+{
+        struct pm80x_onkey_info *info = platform_get_drvdata(pdev);
+
+        device_init_wakeup(&pdev->dev, 0);
+        pm80x_free_irq(info->pm80x, info->irq, info);
+        input_unregister_device(info->idev);
+        kfree(info);
+        return 0;
+}
+
+static struct platform_driver pm80x_onkey_driver = {
+        .driver = {
+                   .name = "88pm80x-onkey",
+                   .owner = THIS_MODULE,
+                   .pm = &pm80x_onkey_pm_ops,
+                   },
+        .probe = pm80x_onkey_probe,
+        .remove = __devexit_p(pm80x_onkey_remove),
+};
+
+module_platform_driver(pm80x_onkey_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Marvell 88PM80x ONKEY driver");
+MODULE_AUTHOR("Qiao Zhou <zhouqiao@marvell.com>");
+MODULE_ALIAS("platform:88pm80x-onkey");
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7faf4a7fcaa9..7c0f1ecfdd7a 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -22,6 +22,16 @@ config INPUT_88PM860X_ONKEY
           To compile this driver as a module, choose M here: the module
           will be called 88pm860x_onkey.
 
+config INPUT_88PM80X_ONKEY
+        tristate "88PM80x ONKEY support"
+        depends on MFD_88PM800
+        help
+          Support the ONKEY of Marvell 88PM80x PMICs as an input device
+          reporting power button status.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 88pm80x_onkey.
+
 config INPUT_AB8500_PONKEY
         tristate "AB8500 Pon (PowerOn) Key"
         depends on AB8500_CORE
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index f55cdf4916fa..83fe6f5b77d1 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -5,6 +5,7 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_INPUT_88PM860X_ONKEY)      += 88pm860x_onkey.o
+obj-$(CONFIG_INPUT_88PM80X_ONKEY)       += 88pm80x_onkey.o
 obj-$(CONFIG_INPUT_AB8500_PONKEY)       += ab8500-ponkey.o
 obj-$(CONFIG_INPUT_AD714X)              += ad714x.o
 obj-$(CONFIG_INPUT_AD714X_I2C)          += ad714x-i2c.o
diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c
index 84ec691c05aa..f06231b7cab1 100644
--- a/drivers/input/misc/ab8500-ponkey.c
+++ b/drivers/input/misc/ab8500-ponkey.c
@@ -74,8 +74,8 @@ static int __devinit ab8500_ponkey_probe(struct platform_device *pdev)
 
         ponkey->idev = input;
         ponkey->ab8500 = ab8500;
-        ponkey->irq_dbf = irq_dbf;
-        ponkey->irq_dbr = irq_dbr;
+        ponkey->irq_dbf = ab8500_irq_get_virq(ab8500, irq_dbf);
+        ponkey->irq_dbr = ab8500_irq_get_virq(ab8500, irq_dbr);
 
         input->name = "AB8500 POn(PowerOn) Key";
         input->dev.parent = &pdev->dev;