8 files changed, 1173 insertions, 2 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 416f9e7286ba..06a2b0f7737c 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -217,6 +217,29 @@ config MFD_WM8350_I2C
           I2C as the control interface.  Additional options must be
           selected to enable support for the functionality of the chip.
 
+config MFD_PCF50633
+        tristate "Support for NXP PCF50633"
+        depends on I2C
+        help
+          Say yes here if you have NXP PCF50633 chip on your board.
+          This core driver provides register access and IRQ handling
+          facilities, and registers devices for the various functions
+          so that function-specific drivers can bind to them.
+
+config PCF50633_ADC
+        tristate "Support for NXP PCF50633 ADC"
+        depends on MFD_PCF50633
+        help
+         Say yes here if you want to include support for ADC in the
+         NXP PCF50633 chip.
+
+config PCF50633_GPIO
+        tristate "Support for NXP PCF50633 GPIO"
+        depends on MFD_PCF50633
+        help
+         Say yes here if you want to include support GPIO for pins on
+         the PCF50633 chip.
+
 endmenu
 
 menu "Multimedia Capabilities Port drivers"
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 0c9418b36c26..3afb5192e4da 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -37,3 +37,7 @@ endif
 obj-$(CONFIG_UCB1400_CORE)      += ucb1400_core.o
 
 obj-$(CONFIG_PMIC_DA903X)       += da903x.o
+
+obj-$(CONFIG_MFD_PCF50633)      += pcf50633-core.o
+obj-$(CONFIG_PCF50633_ADC)      += pcf50633-adc.o
+obj-$(CONFIG_PCF50633_GPIO)     += pcf50633-gpio.o
\ No newline at end of file
diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index 4214b3f72426..7ac12cb0be4a 100644
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -107,6 +107,9 @@ static const u8 msp_gpios[] = {
         MSP_GPIO(0, SWITCH1), MSP_GPIO(1, SWITCH1),
         MSP_GPIO(2, SWITCH1), MSP_GPIO(3, SWITCH1),
         MSP_GPIO(4, SWITCH1),
+        /* switches on MMC/SD sockets */
+        MSP_GPIO(1, SDMMC), MSP_GPIO(2, SDMMC), /* mmc0 WP, nCD */
+        MSP_GPIO(3, SDMMC), MSP_GPIO(4, SDMMC), /* mmc1 WP, nCD */
 };
 
 #define MSP_GPIO_REG(offset)    (msp_gpios[(offset)] >> 3)
@@ -304,6 +307,13 @@ static int add_children(struct i2c_client *client)
                 gpio_export(gpio, false);
         }
 
+        /* MMC/SD inputs -- right after the last config input */
+        if (client->dev.platform_data) {
+                void (*mmcsd_setup)(unsigned) = client->dev.platform_data;
+
+                mmcsd_setup(dm355evm_msp_gpio.base + 8 + 5);
+        }
+
         /* RTC is a 32 bit counter, no alarm */
         if (msp_has_rtc()) {
                 child = add_child(client, "rtc-dm355evm",
diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c
new file mode 100644
index 000000000000..c2d05becfa97
--- /dev/null
+++ b/drivers/mfd/pcf50633-adc.c
@@ -0,0 +1,277 @@
+/* NXP PCF50633 ADC Driver
+ *
+ * (C) 2006-2008 by Openmoko, Inc.
+ * Author: Balaji Rao <balajirrao@openmoko.org>
+ * All rights reserved.
+ *
+ * Broken down from monstrous PCF50633 driver mainly by
+ * Harald Welte, Andy Green and Werner Almesberger
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  NOTE: This driver does not yet support subtractive ADC mode, which means
+ *  you can do only one measurement per read request.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/completion.h>
+
+#include <linux/mfd/pcf50633/core.h>
+#include <linux/mfd/pcf50633/adc.h>
+
+struct pcf50633_adc_request {
+        int mux;
+        int avg;
+        int result;
+        void (*callback)(struct pcf50633 *, void *, int);
+        void *callback_param;
+
+        /* Used in case of sync requests */
+        struct completion completion;
+
+};
+
+#define PCF50633_MAX_ADC_FIFO_DEPTH 8
+
+struct pcf50633_adc {
+        struct pcf50633 *pcf;
+
+        /* Private stuff */
+        struct pcf50633_adc_request *queue[PCF50633_MAX_ADC_FIFO_DEPTH];
+        int queue_head;
+        int queue_tail;
+        struct mutex queue_mutex;
+};
+
+static inline struct pcf50633_adc *__to_adc(struct pcf50633 *pcf)
+{
+        return platform_get_drvdata(pcf->adc_pdev);
+}
+
+static void adc_setup(struct pcf50633 *pcf, int channel, int avg)
+{
+        channel &= PCF50633_ADCC1_ADCMUX_MASK;
+
+        /* kill ratiometric, but enable ACCSW biasing */
+        pcf50633_reg_write(pcf, PCF50633_REG_ADCC2, 0x00);
+        pcf50633_reg_write(pcf, PCF50633_REG_ADCC3, 0x01);
+
+        /* start ADC conversion on selected channel */
+        pcf50633_reg_write(pcf, PCF50633_REG_ADCC1, channel | avg |
+                    PCF50633_ADCC1_ADCSTART | PCF50633_ADCC1_RES_10BIT);
+}
+
+static void trigger_next_adc_job_if_any(struct pcf50633 *pcf)
+{
+        struct pcf50633_adc *adc = __to_adc(pcf);
+        int head;
+
+        mutex_lock(&adc->queue_mutex);
+
+        head = adc->queue_head;
+
+        if (!adc->queue[head]) {
+                mutex_unlock(&adc->queue_mutex);
+                return;
+        }
+        mutex_unlock(&adc->queue_mutex);
+
+        adc_setup(pcf, adc->queue[head]->mux, adc->queue[head]->avg);
+}
+
+static int
+adc_enqueue_request(struct pcf50633 *pcf, struct pcf50633_adc_request *req)
+{
+        struct pcf50633_adc *adc = __to_adc(pcf);
+        int head, tail;
+
+        mutex_lock(&adc->queue_mutex);
+
+        head = adc->queue_head;
+        tail = adc->queue_tail;
+
+        if (adc->queue[tail]) {
+                mutex_unlock(&adc->queue_mutex);
+                return -EBUSY;
+        }
+
+        adc->queue[tail] = req;
+        adc->queue_tail = (tail + 1) & (PCF50633_MAX_ADC_FIFO_DEPTH - 1);
+
+        mutex_unlock(&adc->queue_mutex);
+
+        trigger_next_adc_job_if_any(pcf);
+
+        return 0;
+}
+
+static void
+pcf50633_adc_sync_read_callback(struct pcf50633 *pcf, void *param, int result)
+{
+        struct pcf50633_adc_request *req = param;
+
+        req->result = result;
+        complete(&req->completion);
+}
+
+int pcf50633_adc_sync_read(struct pcf50633 *pcf, int mux, int avg)
+{
+        struct pcf50633_adc_request *req;
+
+        /* req is freed when the result is ready, in interrupt handler */
+        req = kzalloc(sizeof(*req), GFP_KERNEL);
+        if (!req)
+                return -ENOMEM;
+
+        req->mux = mux;
+        req->avg = avg;
+        req->callback =  pcf50633_adc_sync_read_callback;
+        req->callback_param = req;
+
+        init_completion(&req->completion);
+        adc_enqueue_request(pcf, req);
+        wait_for_completion(&req->completion);
+
+        return req->result;
+}
+EXPORT_SYMBOL_GPL(pcf50633_adc_sync_read);
+
+int pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg,
+                             void (*callback)(struct pcf50633 *, void *, int),
+                             void *callback_param)
+{
+        struct pcf50633_adc_request *req;
+
+        /* req is freed when the result is ready, in interrupt handler */
+        req = kmalloc(sizeof(*req), GFP_KERNEL);
+        if (!req)
+                return -ENOMEM;
+
+        req->mux = mux;
+        req->avg = avg;
+        req->callback = callback;
+        req->callback_param = callback_param;
+
+        adc_enqueue_request(pcf, req);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(pcf50633_adc_async_read);
+
+static int adc_result(struct pcf50633 *pcf)
+{
+        u8 adcs1, adcs3;
+        u16 result;
+
+        adcs1 = pcf50633_reg_read(pcf, PCF50633_REG_ADCS1);
+        adcs3 = pcf50633_reg_read(pcf, PCF50633_REG_ADCS3);
+        result = (adcs1 << 2) | (adcs3 & PCF50633_ADCS3_ADCDAT1L_MASK);
+
+        dev_dbg(pcf->dev, "adc result = %d\n", result);
+
+        return result;
+}
+
+static void pcf50633_adc_irq(int irq, void *data)
+{
+        struct pcf50633_adc *adc = data;
+        struct pcf50633 *pcf = adc->pcf;
+        struct pcf50633_adc_request *req;
+        int head;
+
+        mutex_lock(&adc->queue_mutex);
+        head = adc->queue_head;
+
+        req = adc->queue[head];
+        if (WARN_ON(!req)) {
+                dev_err(pcf->dev, "pcf50633-adc irq: ADC queue empty!\n");
+                mutex_unlock(&adc->queue_mutex);
+                return;
+        }
+        adc->queue[head] = NULL;
+        adc->queue_head = (head + 1) &
+                                      (PCF50633_MAX_ADC_FIFO_DEPTH - 1);
+
+        mutex_unlock(&adc->queue_mutex);
+
+        req->callback(pcf, req->callback_param, adc_result(pcf));
+        kfree(req);
+
+        trigger_next_adc_job_if_any(pcf);
+}
+
+static int __devinit pcf50633_adc_probe(struct platform_device *pdev)
+{
+        struct pcf50633_subdev_pdata *pdata = pdev->dev.platform_data;
+        struct pcf50633_adc *adc;
+
+        adc = kzalloc(sizeof(*adc), GFP_KERNEL);
+        if (!adc)
+                return -ENOMEM;
+
+        adc->pcf = pdata->pcf;
+        platform_set_drvdata(pdev, adc);
+
+        pcf50633_register_irq(pdata->pcf, PCF50633_IRQ_ADCRDY,
+                                        pcf50633_adc_irq, adc);
+
+        mutex_init(&adc->queue_mutex);
+
+        return 0;
+}
+
+static int __devexit pcf50633_adc_remove(struct platform_device *pdev)
+{
+        struct pcf50633_adc *adc = platform_get_drvdata(pdev);
+        int i, head;
+
+        pcf50633_free_irq(adc->pcf, PCF50633_IRQ_ADCRDY);
+
+        mutex_lock(&adc->queue_mutex);
+        head = adc->queue_head;
+
+        if (WARN_ON(adc->queue[head]))
+                dev_err(adc->pcf->dev,
+                        "adc driver removed with request pending\n");
+
+        for (i = 0; i < PCF50633_MAX_ADC_FIFO_DEPTH; i++)
+                kfree(adc->queue[i]);
+
+        mutex_unlock(&adc->queue_mutex);
+        kfree(adc);
+
+        return 0;
+}
+
+static struct platform_driver pcf50633_adc_driver = {
+        .driver = {
+                .name = "pcf50633-adc",
+        },
+        .probe = pcf50633_adc_probe,
+        .remove = __devexit_p(pcf50633_adc_remove),
+};
+
+static int __init pcf50633_adc_init(void)
+{
+        return platform_driver_register(&pcf50633_adc_driver);
+}
+module_init(pcf50633_adc_init);
+
+static void __exit pcf50633_adc_exit(void)
+{
+        platform_driver_unregister(&pcf50633_adc_driver);
+}
+module_exit(pcf50633_adc_exit);
+
+MODULE_AUTHOR("Balaji Rao <balajirrao@openmoko.org>");
+MODULE_DESCRIPTION("PCF50633 adc driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pcf50633-adc");
+
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
new file mode 100644
index 000000000000..24508e28e3fb
--- /dev/null
+++ b/drivers/mfd/pcf50633-core.c
@@ -0,0 +1,710 @@
+/* NXP PCF50633 Power Management Unit (PMU) driver
+ *
+ * (C) 2006-2008 by Openmoko, Inc.
+ * Author: Harald Welte <laforge@openmoko.org>
+ *         Balaji Rao <balajirrao@openmoko.org>
+ * All rights reserved.
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/sysfs.h>
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/irq.h>
+
+#include <linux/mfd/pcf50633/core.h>
+
+/* Two MBCS registers used during cold start */
+#define PCF50633_REG_MBCS1              0x4b
+#define PCF50633_REG_MBCS2              0x4c
+#define PCF50633_MBCS1_USBPRES          0x01
+#define PCF50633_MBCS1_ADAPTPRES        0x01
+
+static int __pcf50633_read(struct pcf50633 *pcf, u8 reg, int num, u8 *data)
+{
+        int ret;
+
+        ret = i2c_smbus_read_i2c_block_data(pcf->i2c_client, reg,
+                                num, data);
+        if (ret < 0)
+                dev_err(pcf->dev, "Error reading %d regs at %d\n", num, reg);
+
+        return ret;
+}
+
+static int __pcf50633_write(struct pcf50633 *pcf, u8 reg, int num, u8 *data)
+{
+        int ret;
+
+        ret = i2c_smbus_write_i2c_block_data(pcf->i2c_client, reg,
+                                num, data);
+        if (ret < 0)
+                dev_err(pcf->dev, "Error writing %d regs at %d\n", num, reg);
+
+        return ret;
+
+}
+
+/* Read a block of upto 32 regs  */
+int pcf50633_read_block(struct pcf50633 *pcf, u8 reg,
+                                        int nr_regs, u8 *data)
+{
+        int ret;
+
+        mutex_lock(&pcf->lock);
+        ret = __pcf50633_read(pcf, reg, nr_regs, data);
+        mutex_unlock(&pcf->lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(pcf50633_read_block);
+
+/* Write a block of upto 32 regs  */
+int pcf50633_write_block(struct pcf50633 *pcf , u8 reg,
+                                        int nr_regs, u8 *data)
+{
+        int ret;
+
+        mutex_lock(&pcf->lock);
+        ret = __pcf50633_write(pcf, reg, nr_regs, data);
+        mutex_unlock(&pcf->lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(pcf50633_write_block);
+
+u8 pcf50633_reg_read(struct pcf50633 *pcf, u8 reg)
+{
+        u8 val;
+
+        mutex_lock(&pcf->lock);
+        __pcf50633_read(pcf, reg, 1, &val);
+        mutex_unlock(&pcf->lock);
+
+        return val;
+}
+EXPORT_SYMBOL_GPL(pcf50633_reg_read);
+
+int pcf50633_reg_write(struct pcf50633 *pcf, u8 reg, u8 val)
+{
+        int ret;
+
+        mutex_lock(&pcf->lock);
+        ret = __pcf50633_write(pcf, reg, 1, &val);
+        mutex_unlock(&pcf->lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(pcf50633_reg_write);
+
+int pcf50633_reg_set_bit_mask(struct pcf50633 *pcf, u8 reg, u8 mask, u8 val)
+{
+        int ret;
+        u8 tmp;
+
+        val &= mask;
+
+        mutex_lock(&pcf->lock);
+        ret = __pcf50633_read(pcf, reg, 1, &tmp);
+        if (ret < 0)
+                goto out;
+
+        tmp &= ~mask;
+        tmp |= val;
+        ret = __pcf50633_write(pcf, reg, 1, &tmp);
+
+out:
+        mutex_unlock(&pcf->lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(pcf50633_reg_set_bit_mask);
+
+int pcf50633_reg_clear_bits(struct pcf50633 *pcf, u8 reg, u8 val)
+{
+        int ret;
+        u8 tmp;
+
+        mutex_lock(&pcf->lock);
+        ret = __pcf50633_read(pcf, reg, 1, &tmp);
+        if (ret < 0)
+                goto out;
+
+        tmp &= ~val;
+        ret = __pcf50633_write(pcf, reg, 1, &tmp);
+
+out:
+        mutex_unlock(&pcf->lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(pcf50633_reg_clear_bits);
+
+/* sysfs attributes */
+static ssize_t show_dump_regs(struct device *dev, struct device_attribute *attr,
+                            char *buf)
+{
+        struct pcf50633 *pcf = dev_get_drvdata(dev);
+        u8 dump[16];
+        int n, n1, idx = 0;
+        char *buf1 = buf;
+        static u8 address_no_read[] = { /* must be ascending */
+                PCF50633_REG_INT1,
+                PCF50633_REG_INT2,
+                PCF50633_REG_INT3,
+                PCF50633_REG_INT4,
+                PCF50633_REG_INT5,
+                0 /* terminator */
+        };
+
+        for (n = 0; n < 256; n += sizeof(dump)) {
+                for (n1 = 0; n1 < sizeof(dump); n1++)
+                        if (n == address_no_read[idx]) {
+                                idx++;
+                                dump[n1] = 0x00;
+                        } else
+                                dump[n1] = pcf50633_reg_read(pcf, n + n1);
+
+                hex_dump_to_buffer(dump, sizeof(dump), 16, 1, buf1, 128, 0);
+                buf1 += strlen(buf1);
+                *buf1++ = '\n';
+                *buf1 = '\0';
+        }
+
+        return buf1 - buf;
+}
+static DEVICE_ATTR(dump_regs, 0400, show_dump_regs, NULL);
+
+static ssize_t show_resume_reason(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct pcf50633 *pcf = dev_get_drvdata(dev);
+        int n;
+
+        n = sprintf(buf, "%02x%02x%02x%02x%02x\n",
+                                pcf->resume_reason[0],
+                                pcf->resume_reason[1],
+                                pcf->resume_reason[2],
+                                pcf->resume_reason[3],
+                                pcf->resume_reason[4]);
+
+        return n;
+}
+static DEVICE_ATTR(resume_reason, 0400, show_resume_reason, NULL);
+
+static struct attribute *pcf_sysfs_entries[] = {
+        &dev_attr_dump_regs.attr,
+        &dev_attr_resume_reason.attr,
+        NULL,
+};
+
+static struct attribute_group pcf_attr_group = {
+        .name   = NULL,                 /* put in device directory */
+        .attrs  = pcf_sysfs_entries,
+};
+
+int pcf50633_register_irq(struct pcf50633 *pcf, int irq,
+                        void (*handler) (int, void *), void *data)
+{
+        if (irq < 0 || irq > PCF50633_NUM_IRQ || !handler)
+                return -EINVAL;
+
+        if (WARN_ON(pcf->irq_handler[irq].handler))
+                return -EBUSY;
+
+        mutex_lock(&pcf->lock);
+        pcf->irq_handler[irq].handler = handler;
+        pcf->irq_handler[irq].data = data;
+        mutex_unlock(&pcf->lock);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(pcf50633_register_irq);
+
+int pcf50633_free_irq(struct pcf50633 *pcf, int irq)
+{
+        if (irq < 0 || irq > PCF50633_NUM_IRQ)
+                return -EINVAL;
+
+        mutex_lock(&pcf->lock);
+        pcf->irq_handler[irq].handler = NULL;
+        mutex_unlock(&pcf->lock);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(pcf50633_free_irq);
+
+static int __pcf50633_irq_mask_set(struct pcf50633 *pcf, int irq, u8 mask)
+{
+        u8 reg, bits, tmp;
+        int ret = 0, idx;
+
+        idx = irq >> 3;
+        reg =  PCF50633_REG_INT1M + idx;
+        bits = 1 << (irq & 0x07);
+
+        mutex_lock(&pcf->lock);
+
+        if (mask) {
+                ret = __pcf50633_read(pcf, reg, 1, &tmp);
+                if (ret < 0)
+                        goto out;
+
+                tmp |= bits;
+
+                ret = __pcf50633_write(pcf, reg, 1, &tmp);
+                if (ret < 0)
+                        goto out;
+
+                pcf->mask_regs[idx] &= ~bits;
+                pcf->mask_regs[idx] |= bits;
+        } else {
+                ret = __pcf50633_read(pcf, reg, 1, &tmp);
+                if (ret < 0)
+                        goto out;
+
+                tmp &= ~bits;
+
+                ret = __pcf50633_write(pcf, reg, 1, &tmp);
+                if (ret < 0)
+                        goto out;
+
+                pcf->mask_regs[idx] &= ~bits;
+        }
+out:
+        mutex_unlock(&pcf->lock);
+
+        return ret;
+}
+
+int pcf50633_irq_mask(struct pcf50633 *pcf, int irq)
+{
+        dev_info(pcf->dev, "Masking IRQ %d\n", irq);
+
+        return __pcf50633_irq_mask_set(pcf, irq, 1);
+}
+EXPORT_SYMBOL_GPL(pcf50633_irq_mask);
+
+int pcf50633_irq_unmask(struct pcf50633 *pcf, int irq)
+{
+        dev_info(pcf->dev, "Unmasking IRQ %d\n", irq);
+
+        return __pcf50633_irq_mask_set(pcf, irq, 0);
+}
+EXPORT_SYMBOL_GPL(pcf50633_irq_unmask);
+
+int pcf50633_irq_mask_get(struct pcf50633 *pcf, int irq)
+{
+        u8 reg, bits;
+
+        reg =  irq >> 3;
+        bits = 1 << (irq & 0x07);
+
+        return pcf->mask_regs[reg] & bits;
+}
+EXPORT_SYMBOL_GPL(pcf50633_irq_mask_get);
+
+static void pcf50633_irq_call_handler(struct pcf50633 *pcf, int irq)
+{
+        if (pcf->irq_handler[irq].handler)
+                pcf->irq_handler[irq].handler(irq, pcf->irq_handler[irq].data);
+}
+
+/* Maximum amount of time ONKEY is held before emergency action is taken */
+#define PCF50633_ONKEY1S_TIMEOUT 8
+
+static void pcf50633_irq_worker(struct work_struct *work)
+{
+        struct pcf50633 *pcf;
+        int ret, i, j;
+        u8 pcf_int[5], chgstat;
+
+        pcf = container_of(work, struct pcf50633, irq_work);
+
+        /* Read the 5 INT regs in one transaction */
+        ret = pcf50633_read_block(pcf, PCF50633_REG_INT1,
+                                                ARRAY_SIZE(pcf_int), pcf_int);
+        if (ret != ARRAY_SIZE(pcf_int)) {
+                dev_err(pcf->dev, "Error reading INT registers\n");
+
+                /*
+                 * If this doesn't ACK the interrupt to the chip, we'll be
+                 * called once again as we're level triggered.
+                 */
+                goto out;
+        }
+
+        /* We immediately read the usb and adapter status. We thus make sure
+         * only of USBINS/USBREM IRQ handlers are called */
+        if (pcf_int[0] & (PCF50633_INT1_USBINS | PCF50633_INT1_USBREM)) {
+                chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);
+                if (chgstat & (0x3 << 4))
+                        pcf_int[0] &= ~(1 << PCF50633_INT1_USBREM);
+                else
+                        pcf_int[0] &= ~(1 << PCF50633_INT1_USBINS);
+        }
+
+        /* Make sure only one of ADPINS or ADPREM is set */
+        if (pcf_int[0] & (PCF50633_INT1_ADPINS | PCF50633_INT1_ADPREM)) {
+                chgstat = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);
+                if (chgstat & (0x3 << 4))
+                        pcf_int[0] &= ~(1 << PCF50633_INT1_ADPREM);
+                else
+                        pcf_int[0] &= ~(1 << PCF50633_INT1_ADPINS);
+        }
+
+        dev_dbg(pcf->dev, "INT1=0x%02x INT2=0x%02x INT3=0x%02x "
+                        "INT4=0x%02x INT5=0x%02x\n", pcf_int[0],
+                        pcf_int[1], pcf_int[2], pcf_int[3], pcf_int[4]);
+
+        /* Some revisions of the chip don't have a 8s standby mode on
+         * ONKEY1S press. We try to manually do it in such cases. */
+        if ((pcf_int[0] & PCF50633_INT1_SECOND) && pcf->onkey1s_held) {
+                dev_info(pcf->dev, "ONKEY1S held for %d secs\n",
+                                                        pcf->onkey1s_held);
+                if (pcf->onkey1s_held++ == PCF50633_ONKEY1S_TIMEOUT)
+                        if (pcf->pdata->force_shutdown)
+                                pcf->pdata->force_shutdown(pcf);
+        }
+
+        if (pcf_int[2] & PCF50633_INT3_ONKEY1S) {
+                dev_info(pcf->dev, "ONKEY1S held\n");
+                pcf->onkey1s_held = 1 ;
+
+                /* Unmask IRQ_SECOND */
+                pcf50633_reg_clear_bits(pcf, PCF50633_REG_INT1M,
+                                                PCF50633_INT1_SECOND);
+
+                /* Unmask IRQ_ONKEYR */
+                pcf50633_reg_clear_bits(pcf, PCF50633_REG_INT2M,
+                                                PCF50633_INT2_ONKEYR);
+        }
+
+        if ((pcf_int[1] & PCF50633_INT2_ONKEYR) && pcf->onkey1s_held) {
+                pcf->onkey1s_held = 0;
+
+                /* Mask SECOND and ONKEYR interrupts */
+                if (pcf->mask_regs[0] & PCF50633_INT1_SECOND)
+                        pcf50633_reg_set_bit_mask(pcf,
+                                        PCF50633_REG_INT1M,
+                                        PCF50633_INT1_SECOND,
+                                        PCF50633_INT1_SECOND);
+
+                if (pcf->mask_regs[1] & PCF50633_INT2_ONKEYR)
+                        pcf50633_reg_set_bit_mask(pcf,
+                                        PCF50633_REG_INT2M,
+                                        PCF50633_INT2_ONKEYR,
+                                        PCF50633_INT2_ONKEYR);
+        }
+
+        /* Have we just resumed ? */
+        if (pcf->is_suspended) {
+                pcf->is_suspended = 0;
+
+                /* Set the resume reason filtering out non resumers */
+                for (i = 0; i < ARRAY_SIZE(pcf_int); i++)
+                        pcf->resume_reason[i] = pcf_int[i] &
+                                                pcf->pdata->resumers[i];
+
+                /* Make sure we don't pass on any ONKEY events to
+                 * userspace now */
+                pcf_int[1] &= ~(PCF50633_INT2_ONKEYR | PCF50633_INT2_ONKEYF);
+        }
+
+        for (i = 0; i < ARRAY_SIZE(pcf_int); i++) {
+                /* Unset masked interrupts */
+                pcf_int[i] &= ~pcf->mask_regs[i];
+
+                for (j = 0; j < 8 ; j++)
+                        if (pcf_int[i] & (1 << j))
+                                pcf50633_irq_call_handler(pcf, (i * 8) + j);
+        }
+
+out:
+        put_device(pcf->dev);
+        enable_irq(pcf->irq);
+}
+
+static irqreturn_t pcf50633_irq(int irq, void *data)
+{
+        struct pcf50633 *pcf = data;
+
+        dev_dbg(pcf->dev, "pcf50633_irq\n");
+
+        get_device(pcf->dev);
+        disable_irq(pcf->irq);
+        schedule_work(&pcf->irq_work);
+
+        return IRQ_HANDLED;
+}
+
+static void
+pcf50633_client_dev_register(struct pcf50633 *pcf, const char *name,
+                                                struct platform_device **pdev)
+{
+        struct pcf50633_subdev_pdata *subdev_pdata;
+        int ret;
+
+        *pdev = platform_device_alloc(name, -1);
+        if (!*pdev) {
+                dev_err(pcf->dev, "Falied to allocate %s\n", name);
+                return;
+        }
+
+        subdev_pdata = kmalloc(sizeof(*subdev_pdata), GFP_KERNEL);
+        if (!subdev_pdata) {
+                dev_err(pcf->dev, "Error allocating subdev pdata\n");
+                platform_device_put(*pdev);
+        }
+
+        subdev_pdata->pcf = pcf;
+        platform_device_add_data(*pdev, subdev_pdata, sizeof(*subdev_pdata));
+
+        (*pdev)->dev.parent = pcf->dev;
+
+        ret = platform_device_add(*pdev);
+        if (ret) {
+                dev_err(pcf->dev, "Failed to register %s: %d\n", name, ret);
+                platform_device_put(*pdev);
+                *pdev = NULL;
+        }
+}
+
+#ifdef CONFIG_PM
+static int pcf50633_suspend(struct device *dev, pm_message_t state)
+{
+        struct pcf50633 *pcf;
+        int ret = 0, i;
+        u8 res[5];
+
+        pcf = dev_get_drvdata(dev);
+
+        /* Make sure our interrupt handlers are not called
+         * henceforth */
+        disable_irq(pcf->irq);
+
+        /* Make sure that any running IRQ worker has quit */
+        cancel_work_sync(&pcf->irq_work);
+
+        /* Save the masks */
+        ret = pcf50633_read_block(pcf, PCF50633_REG_INT1M,
+                                ARRAY_SIZE(pcf->suspend_irq_masks),
+                                        pcf->suspend_irq_masks);
+        if (ret < 0) {
+                dev_err(pcf->dev, "error saving irq masks\n");
+                goto out;
+        }
+
+        /* Write wakeup irq masks */
+        for (i = 0; i < ARRAY_SIZE(res); i++)
+                res[i] = ~pcf->pdata->resumers[i];
+
+        ret = pcf50633_write_block(pcf, PCF50633_REG_INT1M,
+                                        ARRAY_SIZE(res), &res[0]);
+        if (ret < 0) {
+                dev_err(pcf->dev, "error writing wakeup irq masks\n");
+                goto out;
+        }
+
+        pcf->is_suspended = 1;
+
+out:
+        return ret;
+}
+
+static int pcf50633_resume(struct device *dev)
+{
+        struct pcf50633 *pcf;
+        int ret;
+
+        pcf = dev_get_drvdata(dev);
+
+        /* Write the saved mask registers */
+        ret = pcf50633_write_block(pcf, PCF50633_REG_INT1M,
+                                ARRAY_SIZE(pcf->suspend_irq_masks),
+                                        pcf->suspend_irq_masks);
+        if (ret < 0)
+                dev_err(pcf->dev, "Error restoring saved suspend masks\n");
+
+        /* Restore regulators' state */
+
+
+        get_device(pcf->dev);
+
+        /*
+         * Clear any pending interrupts and set resume reason if any.
+         * This will leave with enable_irq()
+         */
+        pcf50633_irq_worker(&pcf->irq_work);
+
+        return 0;
+}
+#else
+#define pcf50633_suspend NULL
+#define pcf50633_resume NULL
+#endif
+
+static int __devinit pcf50633_probe(struct i2c_client *client,
+                                const struct i2c_device_id *ids)
+{
+        struct pcf50633 *pcf;
+        struct pcf50633_platform_data *pdata = client->dev.platform_data;
+        int i, ret = 0;
+        int version, variant;
+
+        pcf = kzalloc(sizeof(*pcf), GFP_KERNEL);
+        if (!pcf)
+                return -ENOMEM;
+
+        pcf->pdata = pdata;
+
+        mutex_init(&pcf->lock);
+
+        i2c_set_clientdata(client, pcf);
+        pcf->dev = &client->dev;
+        pcf->i2c_client = client;
+        pcf->irq = client->irq;
+
+        INIT_WORK(&pcf->irq_work, pcf50633_irq_worker);
+
+        version = pcf50633_reg_read(pcf, 0);
+        variant = pcf50633_reg_read(pcf, 1);
+        if (version < 0 || variant < 0) {
+                dev_err(pcf->dev, "Unable to probe pcf50633\n");
+                ret = -ENODEV;
+                goto err;
+        }
+
+        dev_info(pcf->dev, "Probed device version %d variant %d\n",
+                                                        version, variant);
+
+        /* Enable all interrupts except RTC SECOND */
+        pcf->mask_regs[0] = 0x80;
+        pcf50633_reg_write(pcf, PCF50633_REG_INT1M, pcf->mask_regs[0]);
+        pcf50633_reg_write(pcf, PCF50633_REG_INT2M, 0x00);
+        pcf50633_reg_write(pcf, PCF50633_REG_INT3M, 0x00);
+        pcf50633_reg_write(pcf, PCF50633_REG_INT4M, 0x00);
+        pcf50633_reg_write(pcf, PCF50633_REG_INT5M, 0x00);
+
+        /* Create sub devices */
+        pcf50633_client_dev_register(pcf, "pcf50633-input",
+                                                &pcf->input_pdev);
+        pcf50633_client_dev_register(pcf, "pcf50633-rtc",
+                                                &pcf->rtc_pdev);
+        pcf50633_client_dev_register(pcf, "pcf50633-mbc",
+                                                &pcf->mbc_pdev);
+        pcf50633_client_dev_register(pcf, "pcf50633-adc",
+                                                &pcf->adc_pdev);
+
+        for (i = 0; i < PCF50633_NUM_REGULATORS; i++) {
+                struct platform_device *pdev;
+
+                pdev = platform_device_alloc("pcf50633-regltr", i);
+                if (!pdev) {
+                        dev_err(pcf->dev, "Cannot create regulator\n");
+                        continue;
+                }
+
+                pdev->dev.parent = pcf->dev;
+                pdev->dev.platform_data = &pdata->reg_init_data[i];
+                pdev->dev.driver_data = pcf;
+                pcf->regulator_pdev[i] = pdev;
+
+                platform_device_add(pdev);
+        }
+
+        if (client->irq) {
+                set_irq_handler(client->irq, handle_level_irq);
+                ret = request_irq(client->irq, pcf50633_irq,
+                                IRQF_TRIGGER_LOW, "pcf50633", pcf);
+
+                if (ret) {
+                        dev_err(pcf->dev, "Failed to request IRQ %d\n", ret);
+                        goto err;
+                }
+        } else {
+                dev_err(pcf->dev, "No IRQ configured\n");
+                goto err;
+        }
+
+        if (enable_irq_wake(client->irq) < 0)
+                dev_err(pcf->dev, "IRQ %u cannot be enabled as wake-up source"
+                        "in this hardware revision", client->irq);
+
+        ret = sysfs_create_group(&client->dev.kobj, &pcf_attr_group);
+        if (ret)
+                dev_err(pcf->dev, "error creating sysfs entries\n");
+
+        if (pdata->probe_done)
+                pdata->probe_done(pcf);
+
+        return 0;
+
+err:
+        kfree(pcf);
+        return ret;
+}
+
+static int __devexit pcf50633_remove(struct i2c_client *client)
+{
+        struct pcf50633 *pcf = i2c_get_clientdata(client);
+        int i;
+
+        free_irq(pcf->irq, pcf);
+
+        platform_device_unregister(pcf->input_pdev);
+        platform_device_unregister(pcf->rtc_pdev);
+        platform_device_unregister(pcf->mbc_pdev);
+        platform_device_unregister(pcf->adc_pdev);
+
+        for (i = 0; i < PCF50633_NUM_REGULATORS; i++)
+                platform_device_unregister(pcf->regulator_pdev[i]);
+
+        kfree(pcf);
+
+        return 0;
+}
+
+static struct i2c_device_id pcf50633_id_table[] = {
+        {"pcf50633", 0x73},
+};
+
+static struct i2c_driver pcf50633_driver = {
+        .driver = {
+                .name   = "pcf50633",
+                .suspend = pcf50633_suspend,
+                .resume = pcf50633_resume,
+        },
+        .id_table = pcf50633_id_table,
+        .probe = pcf50633_probe,
+        .remove = __devexit_p(pcf50633_remove),
+};
+
+static int __init pcf50633_init(void)
+{
+        return i2c_add_driver(&pcf50633_driver);
+}
+
+static void __exit pcf50633_exit(void)
+{
+        i2c_del_driver(&pcf50633_driver);
+}
+
+MODULE_DESCRIPTION("I2C chip driver for NXP PCF50633 PMU");
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_LICENSE("GPL");
+
+module_init(pcf50633_init);
+module_exit(pcf50633_exit);
diff --git a/drivers/mfd/pcf50633-gpio.c b/drivers/mfd/pcf50633-gpio.c
new file mode 100644
index 000000000000..2fa2eca5c9cc
--- /dev/null
+++ b/drivers/mfd/pcf50633-gpio.c
@@ -0,0 +1,118 @@
+/* NXP PCF50633 GPIO Driver
+ *
+ * (C) 2006-2008 by Openmoko, Inc.
+ * Author: Balaji Rao <balajirrao@openmoko.org>
+ * All rights reserved.
+ *
+ * Broken down from monstrous PCF50633 driver mainly by
+ * Harald Welte, Andy Green and Werner Almesberger
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#include <linux/kernel.h>
+
+#include <linux/mfd/pcf50633/core.h>
+#include <linux/mfd/pcf50633/gpio.h>
+
+enum pcf50633_regulator_id {
+        PCF50633_REGULATOR_AUTO,
+        PCF50633_REGULATOR_DOWN1,
+        PCF50633_REGULATOR_DOWN2,
+        PCF50633_REGULATOR_LDO1,
+        PCF50633_REGULATOR_LDO2,
+        PCF50633_REGULATOR_LDO3,
+        PCF50633_REGULATOR_LDO4,
+        PCF50633_REGULATOR_LDO5,
+        PCF50633_REGULATOR_LDO6,
+        PCF50633_REGULATOR_HCLDO,
+        PCF50633_REGULATOR_MEMLDO,
+};
+
+#define PCF50633_REG_AUTOOUT    0x1a
+#define PCF50633_REG_DOWN1OUT   0x1e
+#define PCF50633_REG_DOWN2OUT   0x22
+#define PCF50633_REG_MEMLDOOUT  0x26
+#define PCF50633_REG_LDO1OUT    0x2d
+#define PCF50633_REG_LDO2OUT    0x2f
+#define PCF50633_REG_LDO3OUT    0x31
+#define PCF50633_REG_LDO4OUT    0x33
+#define PCF50633_REG_LDO5OUT    0x35
+#define PCF50633_REG_LDO6OUT    0x37
+#define PCF50633_REG_HCLDOOUT   0x39
+
+static const u8 pcf50633_regulator_registers[PCF50633_NUM_REGULATORS] = {
+        [PCF50633_REGULATOR_AUTO]       = PCF50633_REG_AUTOOUT,
+        [PCF50633_REGULATOR_DOWN1]      = PCF50633_REG_DOWN1OUT,
+        [PCF50633_REGULATOR_DOWN2]      = PCF50633_REG_DOWN2OUT,
+        [PCF50633_REGULATOR_MEMLDO]     = PCF50633_REG_MEMLDOOUT,
+        [PCF50633_REGULATOR_LDO1]       = PCF50633_REG_LDO1OUT,
+        [PCF50633_REGULATOR_LDO2]       = PCF50633_REG_LDO2OUT,
+        [PCF50633_REGULATOR_LDO3]       = PCF50633_REG_LDO3OUT,
+        [PCF50633_REGULATOR_LDO4]       = PCF50633_REG_LDO4OUT,
+        [PCF50633_REGULATOR_LDO5]       = PCF50633_REG_LDO5OUT,
+        [PCF50633_REGULATOR_LDO6]       = PCF50633_REG_LDO6OUT,
+        [PCF50633_REGULATOR_HCLDO]      = PCF50633_REG_HCLDOOUT,
+};
+
+int pcf50633_gpio_set(struct pcf50633 *pcf, int gpio, u8 val)
+{
+        u8 reg;
+
+        reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
+
+        return pcf50633_reg_set_bit_mask(pcf, reg, 0x07, val);
+}
+EXPORT_SYMBOL_GPL(pcf50633_gpio_set);
+
+u8 pcf50633_gpio_get(struct pcf50633 *pcf, int gpio)
+{
+        u8 reg, val;
+
+        reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
+        val = pcf50633_reg_read(pcf, reg) & 0x07;
+
+        return val;
+}
+EXPORT_SYMBOL_GPL(pcf50633_gpio_get);
+
+int pcf50633_gpio_invert_set(struct pcf50633 *pcf, int gpio, int invert)
+{
+        u8 val, reg;
+
+        reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
+        val = !!invert << 3;
+
+        return pcf50633_reg_set_bit_mask(pcf, reg, 1 << 3, val);
+}
+EXPORT_SYMBOL_GPL(pcf50633_gpio_invert_set);
+
+int pcf50633_gpio_invert_get(struct pcf50633 *pcf, int gpio)
+{
+        u8 reg, val;
+
+        reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
+        val = pcf50633_reg_read(pcf, reg);
+
+        return val & (1 << 3);
+}
+EXPORT_SYMBOL_GPL(pcf50633_gpio_invert_get);
+
+int pcf50633_gpio_power_supply_set(struct pcf50633 *pcf,
+                                        int gpio, int regulator, int on)
+{
+        u8 reg, val, mask;
+
+        /* the *ENA register is always one after the *OUT register */
+        reg = pcf50633_regulator_registers[regulator] + 1;
+
+        val = !!on << (gpio - PCF50633_GPIO1);
+        mask = 1 << (gpio - PCF50633_GPIO1);
+
+        return pcf50633_reg_set_bit_mask(pcf, reg, mask, val);
+}
+EXPORT_SYMBOL_GPL(pcf50633_gpio_power_supply_set);
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 170f9d47c2f9..0e5761f12634 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -41,6 +41,7 @@ struct sm501_gpio_chip {
         struct gpio_chip        gpio;
         struct sm501_gpio       *ourgpio;       /* to get back to parent. */
         void __iomem            *regbase;
+        void __iomem            *control;       /* address of control reg. */
 };
 
 struct sm501_gpio {
@@ -908,6 +909,25 @@ static int sm501_gpio_get(struct gpio_chip *chip, unsigned offset)
         return result & 1UL;
 }
 
+static void sm501_gpio_ensure_gpio(struct sm501_gpio_chip *smchip,
+                                   unsigned long bit)
+{
+        unsigned long ctrl;
+
+        /* check and modify if this pin is not set as gpio. */
+
+        if (readl(smchip->control) & bit) {
+                dev_info(sm501_gpio_to_dev(smchip->ourgpio)->dev,
+                         "changing mode of gpio, bit %08lx\n", bit);
+
+                ctrl = readl(smchip->control);
+                ctrl &= ~bit;
+                writel(ctrl, smchip->control);
+
+                sm501_sync_regs(sm501_gpio_to_dev(smchip->ourgpio));
+        }
+}
+
 static void sm501_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 
 {
@@ -929,6 +949,8 @@ static void sm501_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
         writel(val, regs);
 
         sm501_sync_regs(sm501_gpio_to_dev(smgpio));
+        sm501_gpio_ensure_gpio(smchip, bit);
+
         spin_unlock_irqrestore(&smgpio->lock, save);
 }
 
@@ -941,8 +963,8 @@ static int sm501_gpio_input(struct gpio_chip *chip, unsigned offset)
         unsigned long save;
         unsigned long ddr;
 
-        dev_info(sm501_gpio_to_dev(smgpio)->dev, "%s(%p,%d)\n",
-                 __func__, chip, offset);
+        dev_dbg(sm501_gpio_to_dev(smgpio)->dev, "%s(%p,%d)\n",
+                __func__, chip, offset);
 
         spin_lock_irqsave(&smgpio->lock, save);
 
@@ -950,6 +972,8 @@ static int sm501_gpio_input(struct gpio_chip *chip, unsigned offset)
         writel(ddr & ~bit, regs + SM501_GPIO_DDR_LOW);
 
         sm501_sync_regs(sm501_gpio_to_dev(smgpio));
+        sm501_gpio_ensure_gpio(smchip, bit);
+
         spin_unlock_irqrestore(&smgpio->lock, save);
 
         return 0;
@@ -1012,9 +1036,11 @@ static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm,
                 if (base > 0)
                         base += 32;
                 chip->regbase = gpio->regs + SM501_GPIO_DATA_HIGH;
+                chip->control = sm->regs + SM501_GPIO63_32_CONTROL;
                 gchip->label  = "SM501-HIGH";
         } else {
                 chip->regbase = gpio->regs + SM501_GPIO_DATA_LOW;
+                chip->control = sm->regs + SM501_GPIO31_0_CONTROL;
                 gchip->label  = "SM501-LOW";
         }
 
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index 4a488be91ed7..e7ab0035d305 100644
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -38,6 +38,9 @@
 #include <linux/i2c.h>
 #include <linux/i2c/twl4030.h>
 
+#ifdef CONFIG_ARM
+#include <mach/cpu.h>
+#endif
 
 /*
  * The TWL4030 "Triton 2" is one of a family of a multi-function "Power