4 files changed, 446 insertions, 0 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index ef22292aa0cd..f67d20e8bc0f 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -827,6 +827,18 @@ config MFD_PM8XXX_IRQ
 config TPS65911_COMPARATOR
         tristate
 
+config MFD_TPS65090
+        bool "TPS65090 Power Management chips"
+        depends on I2C=y && GENERIC_HARDIRQS
+        select MFD_CORE
+        select REGMAP_I2C
+        help
+          If you say yes here you get support for the TPS65090 series of
+          Power Management chips.
+          This driver provides common support for accessing the device,
+          additional drivers must be enabled in order to use the
+          functionality of the device.
+
 config MFD_AAT2870_CORE
         bool "Support for the AnalogicTech AAT2870"
         select MFD_CORE
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 67f7b0e34d37..05fa538c5efe 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -110,6 +110,7 @@ obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o
 obj-$(CONFIG_MFD_PM8921_CORE)   += pm8921-core.o
 obj-$(CONFIG_MFD_PM8XXX_IRQ)    += pm8xxx-irq.o
 obj-$(CONFIG_TPS65911_COMPARATOR)       += tps65911-comparator.o
+obj-$(CONFIG_MFD_TPS65090)      += tps65090.o
 obj-$(CONFIG_MFD_AAT2870_CORE)  += aat2870-core.o
 obj-$(CONFIG_MFD_INTEL_MSIC)    += intel_msic.o
 obj-$(CONFIG_MFD_RC5T583)       += rc5t583.o rc5t583-irq.o
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
new file mode 100644
index 000000000000..a66d4df51293
--- /dev/null
+++ b/drivers/mfd/tps65090.c
@@ -0,0 +1,387 @@
+/*
+ * Core driver for TI TPS65090 PMIC family
+ *
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+
+ * This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/tps65090.h>
+#include <linux/regmap.h>
+#include <linux/err.h>
+
+#define NUM_INT_REG 2
+#define TOTAL_NUM_REG 0x18
+
+/* interrupt status registers */
+#define TPS65090_INT_STS        0x0
+#define TPS65090_INT_STS2       0x1
+
+/* interrupt mask registers */
+#define TPS65090_INT_MSK        0x2
+#define TPS65090_INT_MSK2       0x3
+
+struct tps65090_irq_data {
+        u8              mask_reg;
+        u8              mask_pos;
+};
+
+#define TPS65090_IRQ(_reg, _mask_pos)           \
+        {                                       \
+                .mask_reg       = (_reg),       \
+                .mask_pos       = (_mask_pos),  \
+        }
+
+static const struct tps65090_irq_data tps65090_irqs[] = {
+        [0]             = TPS65090_IRQ(0, 0),
+        [1]             = TPS65090_IRQ(0, 1),
+        [2]             = TPS65090_IRQ(0, 2),
+        [3]             = TPS65090_IRQ(0, 3),
+        [4]             = TPS65090_IRQ(0, 4),
+        [5]             = TPS65090_IRQ(0, 5),
+        [6]             = TPS65090_IRQ(0, 6),
+        [7]             = TPS65090_IRQ(0, 7),
+        [8]             = TPS65090_IRQ(1, 0),
+        [9]             = TPS65090_IRQ(1, 1),
+        [10]            = TPS65090_IRQ(1, 2),
+        [11]            = TPS65090_IRQ(1, 3),
+        [12]            = TPS65090_IRQ(1, 4),
+        [13]            = TPS65090_IRQ(1, 5),
+        [14]            = TPS65090_IRQ(1, 6),
+        [15]            = TPS65090_IRQ(1, 7),
+};
+
+static struct mfd_cell tps65090s[] = {
+        {
+                .name = "tps65910-pmic",
+        },
+        {
+                .name = "tps65910-regulator",
+        },
+};
+
+struct tps65090 {
+        struct mutex            lock;
+        struct device           *dev;
+        struct i2c_client       *client;
+        struct regmap           *rmap;
+        struct irq_chip         irq_chip;
+        struct mutex            irq_lock;
+        int                     irq_base;
+        unsigned int            id;
+};
+
+int tps65090_write(struct device *dev, int reg, uint8_t val)
+{
+        struct tps65090 *tps = dev_get_drvdata(dev);
+        return regmap_write(tps->rmap, reg, val);
+}
+EXPORT_SYMBOL_GPL(tps65090_write);
+
+int tps65090_read(struct device *dev, int reg, uint8_t *val)
+{
+        struct tps65090 *tps = dev_get_drvdata(dev);
+        unsigned int temp_val;
+        int ret;
+        ret = regmap_read(tps->rmap, reg, &temp_val);
+        if (!ret)
+                *val = temp_val;
+        return ret;
+}
+EXPORT_SYMBOL_GPL(tps65090_read);
+
+int tps65090_set_bits(struct device *dev, int reg, uint8_t bit_num)
+{
+        struct tps65090 *tps = dev_get_drvdata(dev);
+        return regmap_update_bits(tps->rmap, reg, BIT(bit_num), ~0u);
+}
+EXPORT_SYMBOL_GPL(tps65090_set_bits);
+
+int tps65090_clr_bits(struct device *dev, int reg, uint8_t bit_num)
+{
+        struct tps65090 *tps = dev_get_drvdata(dev);
+        return regmap_update_bits(tps->rmap, reg, BIT(bit_num), 0u);
+}
+EXPORT_SYMBOL_GPL(tps65090_clr_bits);
+
+static void tps65090_irq_lock(struct irq_data *data)
+{
+        struct tps65090 *tps65090 = irq_data_get_irq_chip_data(data);
+
+        mutex_lock(&tps65090->irq_lock);
+}
+
+static void tps65090_irq_mask(struct irq_data *irq_data)
+{
+        struct tps65090 *tps65090 = irq_data_get_irq_chip_data(irq_data);
+        unsigned int __irq = irq_data->hwirq;
+        const struct tps65090_irq_data *data = &tps65090_irqs[__irq];
+
+        tps65090_set_bits(tps65090->dev, (TPS65090_INT_MSK + data->mask_reg),
+                data->mask_pos);
+}
+
+static void tps65090_irq_unmask(struct irq_data *irq_data)
+{
+        struct tps65090 *tps65090 = irq_data_get_irq_chip_data(irq_data);
+        unsigned int __irq = irq_data->irq - tps65090->irq_base;
+        const struct tps65090_irq_data *data = &tps65090_irqs[__irq];
+
+        tps65090_clr_bits(tps65090->dev, (TPS65090_INT_MSK + data->mask_reg),
+                data->mask_pos);
+}
+
+static void tps65090_irq_sync_unlock(struct irq_data *data)
+{
+        struct tps65090 *tps65090 = irq_data_get_irq_chip_data(data);
+
+        mutex_unlock(&tps65090->irq_lock);
+}
+
+static irqreturn_t tps65090_irq(int irq, void *data)
+{
+        struct tps65090 *tps65090 = data;
+        int ret = 0;
+        u8 status, mask;
+        unsigned long int acks = 0;
+        int i;
+