Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6

* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c

4 files changed, 310 insertions, 17 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 56aa465d1b99..22d875fde53a 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -134,6 +134,16 @@ config INPUT_MAX8925_ONKEY
           To compile this driver as a module, choose M here: the module
           will be called max8925_onkey.
 
+config INPUT_MC13783_PWRBUTTON
+        tristate "MC13783 ON buttons"
+        depends on MFD_MC13783
+        help
+          Support the ON buttons of MC13783 PMIC as an input device
+          reporting power button status.
+
+          To compile this driver as a module, choose M here: the module
+          will be called mc13783-pwrbutton.
+
 config INPUT_MMA8450
         tristate "MMA8450 - Freescale's 3-Axis, 8/12-bit Digital Accelerometer"
         depends on I2C
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 62dcd79d548f..a244fc6a781c 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)	+= keyspan_remote.o
 obj-$(CONFIG_INPUT_KXTJ9)               += kxtj9.o
 obj-$(CONFIG_INPUT_M68K_BEEP)           += m68kspkr.o
 obj-$(CONFIG_INPUT_MAX8925_ONKEY)       += max8925_onkey.o
+obj-$(CONFIG_INPUT_MC13783_PWRBUTTON)   += mc13783-pwrbutton.o
 obj-$(CONFIG_INPUT_MMA8450)             += mma8450.o
 obj-$(CONFIG_INPUT_MPU3050)             += mpu3050.o
 obj-$(CONFIG_INPUT_PCAP)                += pcap_keys.o
diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c
new file mode 100644
index 000000000000..09b052288657
--- /dev/null
+++ b/drivers/input/misc/mc13783-pwrbutton.c
@@ -0,0 +1,282 @@
+/**
+ * Copyright (C) 2011 Philippe Rétornaz
+ *
+ * Based on twl4030-pwrbutton driver by:
+ *     Peter De Schrijver <peter.de-schrijver@nokia.com>
+ *     Felipe Balbi <felipe.balbi@nokia.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., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/mc13783.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+
+struct mc13783_pwrb {
+        struct input_dev *pwr;
+        struct mc13xxx *mc13783;
+#define MC13783_PWRB_B1_POL_INVERT      (1 << 0)
+#define MC13783_PWRB_B2_POL_INVERT      (1 << 1)
+#define MC13783_PWRB_B3_POL_INVERT      (1 << 2)
+        int flags;
+        unsigned short keymap[3];
+};
+
+#define MC13783_REG_INTERRUPT_SENSE_1           5
+#define MC13783_IRQSENSE1_ONOFD1S               (1 << 3)
+#define MC13783_IRQSENSE1_ONOFD2S               (1 << 4)
+#define MC13783_IRQSENSE1_ONOFD3S               (1 << 5)
+
+#define MC13783_REG_POWER_CONTROL_2             15
+#define MC13783_POWER_CONTROL_2_ON1BDBNC        4
+#define MC13783_POWER_CONTROL_2_ON2BDBNC        6
+#define MC13783_POWER_CONTROL_2_ON3BDBNC        8
+#define MC13783_POWER_CONTROL_2_ON1BRSTEN       (1 << 1)
+#define MC13783_POWER_CONTROL_2_ON2BRSTEN       (1 << 2)
+#define MC13783_POWER_CONTROL_2_ON3BRSTEN       (1 << 3)
+
+static irqreturn_t button_irq(int irq, void *_priv)
+{
+        struct mc13783_pwrb *priv = _priv;
+        int val;
+
+        mc13xxx_irq_ack(priv->mc13783, irq);
+        mc13xxx_reg_read(priv->mc13783, MC13783_REG_INTERRUPT_SENSE_1, &val);
+
+        switch (irq) {
+        case MC13783_IRQ_ONOFD1:
+                val = val & MC13783_IRQSENSE1_ONOFD1S ? 1 : 0;
+                if (priv->flags & MC13783_PWRB_B1_POL_INVERT)
+                        val ^= 1;
+                input_report_key(priv->pwr, priv->keymap[0], val);
+                break;
+
+        case MC13783_IRQ_ONOFD2:
+                val = val & MC13783_IRQSENSE1_ONOFD2S ? 1 : 0;
+                if (priv->flags & MC13783_PWRB_B2_POL_INVERT)
+                        val ^= 1;
+                input_report_key(priv->pwr, priv->keymap[1], val);
+                break;
+
+        case MC13783_IRQ_ONOFD3:
+                val = val & MC13783_IRQSENSE1_ONOFD3S ? 1 : 0;
+                if (priv->flags & MC13783_PWRB_B3_POL_INVERT)
+                        val ^= 1;
+                input_report_key(priv->pwr, priv->keymap[2], val);
+                break;
+        }
+
+        input_sync(priv->pwr);
+
+        return IRQ_HANDLED;
+}
+
+static int __devinit mc13783_pwrbutton_probe(struct platform_device *pdev)
+{
+        const struct mc13xxx_buttons_platform_data *pdata;
+        struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
+        struct input_dev *pwr;
+        struct mc13783_pwrb *priv;
+        int err = 0;
+        int reg = 0;
+
+        pdata = dev_get_platdata(&pdev->dev);
+        if (!pdata) {
+                dev_err(&pdev->dev, "missing platform data\n");
+                return -ENODEV;
+        }
+
+        pwr = input_allocate_device();
+        if (!pwr) {
+                dev_dbg(&pdev->dev, "Can't allocate power button\n");
+                return -ENOMEM;
+        }
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                err = -ENOMEM;
+                dev_dbg(&pdev->dev, "Can't allocate power button\n");
+                goto free_input_dev;
+        }
+
+        reg |= (pdata->b1on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON1BDBNC;
+        reg |= (pdata->b2on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON2BDBNC;
+        reg |= (pdata->b3on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON3BDBNC;
+
+        priv->pwr = pwr;
+        priv->mc13783 = mc13783;
+
+        mc13xxx_lock(mc13783);
+
+        if (pdata->b1on_flags & MC13783_BUTTON_ENABLE) {
+                priv->keymap[0] = pdata->b1on_key;
+                if (pdata->b1on_key != KEY_RESERVED)
+                        __set_bit(pdata->b1on_key, pwr->keybit);
+
+                if (pdata->b1on_flags & MC13783_BUTTON_POL_INVERT)
+                        priv->flags |= MC13783_PWRB_B1_POL_INVERT;
+
+                if (pdata->b1on_flags & MC13783_BUTTON_RESET_EN)
+                        reg |= MC13783_POWER_CONTROL_2_ON1BRSTEN;
+
+                err = mc13xxx_irq_request(mc13783, MC13783_IRQ_ONOFD1,
+                                          button_irq, "b1on", priv);
+                if (err) {
+                        dev_dbg(&pdev->dev, "Can't request irq\n");
+                        goto free_priv;
+                }
+        }
+
+        if (pdata->b2on_flags & MC13783_BUTTON_ENABLE) {
+                priv->keymap[1] = pdata->b2on_key;
+                if (pdata->b2on_key != KEY_RESERVED)
+                        __set_bit(pdata->b2on_key, pwr->keybit);
+
+                if (pdata->b2on_flags & MC13783_BUTTON_POL_INVERT)
+                        priv->flags |= MC13783_PWRB_B2_POL_INVERT;
+
+                if (pdata->b2on_flags & MC13783_BUTTON_RESET_EN)
+                        reg |= MC13783_POWER_CONTROL_2_ON2BRSTEN;
+
+                err = mc13xxx_irq_request(mc13783, MC13783_IRQ_ONOFD2,
+                                          button_irq, "b2on", priv);
+                if (err) {
+                        dev_dbg(&pdev->dev, "Can't request irq\n");
+                        goto free_irq_b1;
+                }
+        }
+
+        if (pdata->b3on_flags & MC13783_BUTTON_ENABLE) {
+                priv->keymap[2] = pdata->b3on_key;
+                if (pdata->b3on_key != KEY_RESERVED)
+                        __set_bit(pdata->b3on_key, pwr->keybit);
+
+                if (pdata->b3on_flags & MC13783_BUTTON_POL_INVERT)
+                        priv->flags |= MC13783_PWRB_B3_POL_INVERT;
+
+                if (pdata->b3on_flags & MC13783_BUTTON_RESET_EN)
+                        reg |= MC13783_POWER_CONTROL_2_ON3BRSTEN;
+
+                err = mc13xxx_irq_request(mc13783, MC13783_IRQ_ONOFD3,
+                                          button_irq, "b3on", priv);
+                if (err) {
+                        dev_dbg(&pdev->dev, "Can't request irq: %d\n", err);
+                        goto free_irq_b2;
+                }
+        }
+
+        mc13xxx_reg_rmw(mc13783, MC13783_REG_POWER_CONTROL_2, 0x3FE, reg);
+
+        mc13xxx_unlock(mc13783);
+
+        pwr->name = "mc13783_pwrbutton";
+        pwr->phys = "mc13783_pwrbutton/input0";
+        pwr->dev.parent = &pdev->dev;
+
+        pwr->keycode = priv->keymap;
+        pwr->keycodemax = ARRAY_SIZE(priv->keymap);
+        pwr->keycodesize = sizeof(priv->keymap[0]);
+        __set_bit(EV_KEY, pwr->evbit);
+
+        err = input_register_device(pwr);
+        if (err) {
+                dev_dbg(&pdev->dev, "Can't register power button: %d\n", err);
+                goto free_irq;
+        }
+
+        platform_set_drvdata(pdev, priv);
+
+        return 0;
+
+free_irq:
+        mc13xxx_lock(mc13783);
+
+        if (pdata->b3on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD3, priv);
+
+free_irq_b2:
+        if (pdata->b2on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD2, priv);
+
+free_irq_b1:
+        if (pdata->b1on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD1, priv);
+
+free_priv:
+        mc13xxx_unlock(mc13783);
+        kfree(priv);
+
+free_input_dev:
+        input_free_device(pwr);
+
+        return err;
+}
+
+static int __devexit mc13783_pwrbutton_remove(struct platform_device *pdev)
+{
+        struct mc13783_pwrb *priv = platform_get_drvdata(pdev);
+        const struct mc13xxx_buttons_platform_data *pdata;
+
+        pdata = dev_get_platdata(&pdev->dev);
+
+        mc13xxx_lock(priv->mc13783);
+
+        if (pdata->b3on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(priv->mc13783, MC13783_IRQ_ONOFD3, priv);
+        if (pdata->b2on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(priv->mc13783, MC13783_IRQ_ONOFD2, priv);
+        if (pdata->b1on_flags & MC13783_BUTTON_ENABLE)
+                mc13xxx_irq_free(priv->mc13783, MC13783_IRQ_ONOFD1, priv);
+
+        mc13xxx_unlock(priv->mc13783);
+
+        input_unregister_device(priv->pwr);
+        kfree(priv);
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+struct platform_driver mc13783_pwrbutton_driver = {
+        .probe          = mc13783_pwrbutton_probe,
+        .remove         = __devexit_p(mc13783_pwrbutton_remove),
+        .driver         = {
+                .name   = "mc13783-pwrbutton",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init mc13783_pwrbutton_init(void)
+{
+        return platform_driver_register(&mc13783_pwrbutton_driver);
+}
+module_init(mc13783_pwrbutton_init);
+
+static void __exit mc13783_pwrbutton_exit(void)
+{
+        platform_driver_unregister(&mc13783_pwrbutton_driver);
+}
+module_exit(mc13783_pwrbutton_exit);
+
+MODULE_ALIAS("platform:mc13783-pwrbutton");
+MODULE_DESCRIPTION("MC13783 Power Button");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Philippe Retornaz");
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
index c5bc62d85bb6..ede02743eac1 100644
--- a/drivers/input/touchscreen/mc13783_ts.c
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -35,7 +35,7 @@ MODULE_PARM_DESC(sample_tolerance,
 
 struct mc13783_ts_priv {
         struct input_dev *idev;
-        struct mc13783 *mc13783;
+        struct mc13xxx *mc13xxx;
         struct delayed_work work;
         struct workqueue_struct *workq;
         unsigned int sample[4];
@@ -45,7 +45,7 @@ static irqreturn_t mc13783_ts_handler(int irq, void *data)
 {
         struct mc13783_ts_priv *priv = data;
 
-        mc13783_irq_ack(priv->mc13783, irq);
+        mc13xxx_irq_ack(priv->mc13xxx, irq);
 
         /*
          * Kick off reading coordinates. Note that if work happens already
@@ -121,10 +121,10 @@ static void mc13783_ts_work(struct work_struct *work)
 {
         struct mc13783_ts_priv *priv =
                 container_of(work, struct mc13783_ts_priv, work.work);
-        unsigned int mode = MC13783_ADC_MODE_TS;
+        unsigned int mode = MC13XXX_ADC_MODE_TS;
         unsigned int channel = 12;
 
-        if (mc13783_adc_do_conversion(priv->mc13783,
+        if (mc13xxx_adc_do_conversion(priv->mc13xxx,
                                 mode, channel, priv->sample) == 0)
                 mc13783_ts_report_sample(priv);
 }
@@ -134,21 +134,21 @@ static int mc13783_ts_open(struct input_dev *dev)
         struct mc13783_ts_priv *priv = input_get_drvdata(dev);
         int ret;
 
-        mc13783_lock(priv->mc13783);
+        mc13xxx_lock(priv->mc13xxx);
 
-        mc13783_irq_ack(priv->mc13783, MC13783_IRQ_TS);
+        mc13xxx_irq_ack(priv->mc13xxx, MC13XXX_IRQ_TS);
 
-        ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_TS,
+        ret = mc13xxx_irq_request(priv->mc13xxx, MC13XXX_IRQ_TS,
                 mc13783_ts_handler, MC13783_TS_NAME, priv);
         if (ret)
                 goto out;
 
-        ret = mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
-                        MC13783_ADC0_TSMOD_MASK, MC13783_ADC0_TSMOD0);
+        ret = mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
+                        MC13XXX_ADC0_TSMOD_MASK, MC13XXX_ADC0_TSMOD0);
         if (ret)
-                mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
+                mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
 out:
-        mc13783_unlock(priv->mc13783);
+        mc13xxx_unlock(priv->mc13xxx);
         return ret;
 }
 
@@ -156,11 +156,11 @@ static void mc13783_ts_close(struct input_dev *dev)
 {
         struct mc13783_ts_priv *priv = input_get_drvdata(dev);
 
-        mc13783_lock(priv->mc13783);
-        mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
-                        MC13783_ADC0_TSMOD_MASK, 0);
-        mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
-        mc13783_unlock(priv->mc13783);
+        mc13xxx_lock(priv->mc13xxx);
+        mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
+                        MC13XXX_ADC0_TSMOD_MASK, 0);
+        mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
+        mc13xxx_unlock(priv->mc13xxx);
 
         cancel_delayed_work_sync(&priv->work);
 }
@@ -177,7 +177,7 @@ static int __init mc13783_ts_probe(struct platform_device *pdev)
                 goto err_free_mem;
 
         INIT_DELAYED_WORK(&priv->work, mc13783_ts_work);
-        priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
+        priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);
         priv->idev = idev;
 
         /*