summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/Kconfig11
-rw-r--r--drivers/mfd/Makefile1
-rwxr-xr-xdrivers/mfd/tps6591x.c593
-rw-r--r--drivers/regulator/Kconfig7
-rw-r--r--drivers/regulator/Makefile1
-rwxr-xr-xdrivers/regulator/tps6591x-regulator.c597
-rwxr-xr-xinclude/linux/mfd/tps6591x.h102
7 files changed, 1312 insertions, 0 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 008179158b78..2819510ea695 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -565,6 +565,17 @@ config MFD_TPS6586X
This driver can also be built as a module. If so, the module
will be called tps6586x.
+config MFD_TPS6591X
+ bool "TPS6591x Power Management chips"
+ depends on I2C && GPIOLIB && GENERIC_HARDIRQS
+ select MFD_CORE
+ help
+ If you say yes here you get support for the TPS6591X 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.
+
endif # MFD_SUPPORT
menu "Multimedia Capabilities Port drivers"
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index fdfc6f01aa82..4ba590f8faf7 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -76,5 +76,6 @@ obj-$(CONFIG_MFD_RDC321X) += rdc321x-southbridge.o
obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o
obj-$(CONFIG_MFD_JZ4740_ADC) += jz4740-adc.o
obj-$(CONFIG_MFD_TPS6586X) += tps6586x.o
+obj-$(CONFIG_MFD_TPS6591X) += tps6591x.o
obj-$(CONFIG_MFD_MAX8907C) += max8907c.o
obj-$(CONFIG_MFD_MAX8907C) += max8907c-irq.o
diff --git a/drivers/mfd/tps6591x.c b/drivers/mfd/tps6591x.c
new file mode 100755
index 000000000000..66a1d5e998cf
--- /dev/null
+++ b/drivers/mfd/tps6591x.c
@@ -0,0 +1,593 @@
+/*
+ * driver/mfd/tps6591x.c
+ *
+ * Core driver for TI TPS6591x PMIC family
+ *
+ * Copyright (C) 2011 NVIDIA Corporation
+ *
+ * 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.
+ *
+ * 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, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#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/gpio.h>
+#include <linux/i2c.h>
+
+#include <linux/mfd/core.h>
+#include <linux/mfd/tps6591x.h>
+
+/* device control registers */
+#define TPS6591X_DEVCTRL 0x3F
+#define TPS6591X_DEVCTRL2 0x40
+
+/* interrupt status registers */
+#define TPS6591X_INT_STS 0x50
+#define TPS6591X_INT_STS2 0x52
+#define TPS6591X_INT_STS3 0x54
+
+/* interrupt mask registers */
+#define TPS6591X_INT_MSK 0x51
+#define TPS6591X_INT_MSK2 0x53
+#define TPS6591X_INT_MSK3 0x55
+
+/* GPIO register base address */
+#define TPS6591X_GPIO_BASE_ADDR 0x60
+
+/* silicon version number */
+#define TPS6591X_VERNUM 0x80
+
+struct tps6591x_irq_data {
+ u8 mask_reg;
+ u8 mask_mask;
+};
+
+#define TPS6591X_IRQ(_reg, _mask) \
+ { \
+ .mask_reg = (_reg) - TPS6591X_INT_MSK, \
+ .mask_mask = (_mask), \
+ }
+
+static const struct tps6591x_irq_data tps6591x_irqs[] = {
+ [TPS6591X_INT_PWRHOLD_F] = TPS6591X_IRQ(TPS6591X_INT_MSK, 1 << 0),
+ [TPS6591X_INT_VMBHI] = TPS6591X_IRQ(TPS6591X_INT_MSK, 1 << 1),
+ [TPS6591X_INT_PWRON] = TPS6591X_IRQ(TPS6591X_INT_MSK, 1 << 2),
+ [TPS6591X_INT_PWRON_LP] = TPS6591X_IRQ(TPS6591X_INT_MSK, 1 << 3),
+ [TPS6591X_INT_PWRHOLD_R] = TPS6591X_IRQ(TPS6591X_INT_MSK, 1 << 4),
+ [TPS6591X_INT_HOTDIE] = TPS6591X_IRQ(TPS6591X_INT_MSK, 1 << 5),
+ [TPS6591X_INT_RTC_ALARM] = TPS6591X_IRQ(TPS6591X_INT_MSK, 1 << 6),
+ [TPS6591X_INT_RTC_PERIOD] = TPS6591X_IRQ(TPS6591X_INT_MSK, 1 << 7),
+ [TPS6591X_INT_GPIO0_R] = TPS6591X_IRQ(TPS6591X_INT_MSK2, 1 << 0),
+ [TPS6591X_INT_GPIO0_F] = TPS6591X_IRQ(TPS6591X_INT_MSK2, 1 << 1),
+ [TPS6591X_INT_GPIO1_R] = TPS6591X_IRQ(TPS6591X_INT_MSK2, 1 << 2),
+ [TPS6591X_INT_GPIO1_F] = TPS6591X_IRQ(TPS6591X_INT_MSK2, 1 << 3),
+ [TPS6591X_INT_GPIO2_R] = TPS6591X_IRQ(TPS6591X_INT_MSK2, 1 << 4),
+ [TPS6591X_INT_GPIO2_F] = TPS6591X_IRQ(TPS6591X_INT_MSK2, 1 << 5),
+ [TPS6591X_INT_GPIO3_R] = TPS6591X_IRQ(TPS6591X_INT_MSK2, 1 << 6),
+ [TPS6591X_INT_GPIO3_F] = TPS6591X_IRQ(TPS6591X_INT_MSK2, 1 << 7),
+ [TPS6591X_INT_GPIO4_R] = TPS6591X_IRQ(TPS6591X_INT_MSK3, 1 << 0),
+ [TPS6591X_INT_GPIO4_F] = TPS6591X_IRQ(TPS6591X_INT_MSK3, 1 << 1),
+ [TPS6591X_INT_GPIO5_R] = TPS6591X_IRQ(TPS6591X_INT_MSK3, 1 << 2),
+ [TPS6591X_INT_GPIO5_F] = TPS6591X_IRQ(TPS6591X_INT_MSK3, 1 << 3),
+ [TPS6591X_INT_WTCHDG] = TPS6591X_IRQ(TPS6591X_INT_MSK3, 1 << 4),
+ [TPS6591X_INT_VMBCH2_H] = TPS6591X_IRQ(TPS6591X_INT_MSK3, 1 << 5),
+ [TPS6591X_INT_VMBCH2_L] = TPS6591X_IRQ(TPS6591X_INT_MSK3, 1 << 6),
+ [TPS6591X_INT_PWRDN] = TPS6591X_IRQ(TPS6591X_INT_MSK3, 1 << 7),
+};
+
+struct tps6591x {
+ struct mutex lock;
+ struct device *dev;
+ struct i2c_client *client;
+
+ struct gpio_chip gpio;
+ struct irq_chip irq_chip;
+ struct mutex irq_lock;
+ int irq_base;
+ u32 irq_en;
+ u8 mask_cache[3];
+ u8 mask_reg[3];
+};
+
+static inline int __tps6591x_read(struct i2c_client *client,
+ int reg, uint8_t *val)
+{
+ int ret;
+
+ ret = i2c_smbus_read_byte_data(client, reg);
+ if (ret < 0) {
+ dev_err(&client->dev, "failed reading at 0x%02x\n", reg);
+ return ret;
+ }
+
+ *val = (uint8_t)ret;
+
+ return 0;
+}
+
+static inline int __tps6591x_reads(struct i2c_client *client, int reg,
+ int len, uint8_t *val)
+{
+ int ret;
+
+ ret = i2c_smbus_read_i2c_block_data(client, reg, len, val);
+ if (ret < 0) {
+ dev_err(&client->dev, "failed reading from 0x%02x\n", reg);
+ return ret;
+ }
+
+ return 0;
+}
+
+static inline int __tps6591x_write(struct i2c_client *client,
+ int reg, uint8_t val)
+{
+ int ret;
+
+ ret = i2c_smbus_write_byte_data(client, reg, val);
+ if (ret < 0) {
+ dev_err(&client->dev, "failed writing 0x%02x to 0x%02x\n",
+ val, reg);
+ return ret;
+ }
+
+ return 0;
+}
+
+static inline int __tps6591x_writes(struct i2c_client *client, int reg,
+ int len, uint8_t *val)
+{
+ int ret;
+
+ ret = i2c_smbus_write_i2c_block_data(client, reg, len, val);
+ if (ret < 0) {
+ dev_err(&client->dev, "failed writings to 0x%02x\n", reg);
+ return ret;
+ }
+
+ return 0;
+}
+
+int tps6591x_write(struct device *dev, int reg, uint8_t val)
+{
+ return __tps6591x_write(to_i2c_client(dev), reg, val);
+}
+EXPORT_SYMBOL_GPL(tps6591x_write);
+
+int tps6591x_writes(struct device *dev, int reg, int len, uint8_t *val)
+{
+ return __tps6591x_writes(to_i2c_client(dev), reg, len, val);
+}
+EXPORT_SYMBOL_GPL(tps6591x_writes);
+
+int tps6591x_read(struct device *dev, int reg, uint8_t *val)
+{
+ return __tps6591x_read(to_i2c_client(dev), reg, val);
+}
+EXPORT_SYMBOL_GPL(tps6591x_read);
+
+int tps6591x_reads(struct device *dev, int reg, int len, uint8_t *val)
+{
+ return __tps6591x_reads(to_i2c_client(dev), reg, len, val);
+}
+EXPORT_SYMBOL_GPL(tps6591x_reads);
+
+int tps6591x_set_bits(struct device *dev, int reg, uint8_t bit_mask)
+{
+ struct tps6591x *tps6591x = dev_get_drvdata(dev);
+ uint8_t reg_val;
+ int ret = 0;
+
+ mutex_lock(&tps6591x->lock);
+
+ ret = __tps6591x_read(to_i2c_client(dev), reg, &reg_val);
+ if (ret)
+ goto out;
+
+ if ((reg_val & bit_mask) == 0) {
+ reg_val |= bit_mask;
+ ret = __tps6591x_write(to_i2c_client(dev), reg, reg_val);
+ }
+out:
+ mutex_unlock(&tps6591x->lock);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(tps6591x_set_bits);
+
+int tps6591x_clr_bits(struct device *dev, int reg, uint8_t bit_mask)
+{
+ struct tps6591x *tps6591x = dev_get_drvdata(dev);
+ uint8_t reg_val;
+ int ret = 0;
+
+ mutex_lock(&tps6591x->lock);
+
+ ret = __tps6591x_read(to_i2c_client(dev), reg, &reg_val);
+ if (ret)
+ goto out;
+
+ if (reg_val & bit_mask) {
+ reg_val &= ~bit_mask;
+ ret = __tps6591x_write(to_i2c_client(dev), reg, reg_val);
+ }
+out:
+ mutex_unlock(&tps6591x->lock);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(tps6591x_clr_bits);
+
+int tps6591x_update(struct device *dev, int reg, uint8_t val, uint8_t mask)
+{
+ struct tps6591x *tps6591x = dev_get_drvdata(dev);
+ uint8_t reg_val;
+ int ret = 0;
+
+ mutex_lock(&tps6591x->lock);
+
+ ret = __tps6591x_read(tps6591x->client, reg, &reg_val);
+ if (ret)
+ goto out;
+
+ if ((reg_val & mask) != val) {
+ reg_val = (reg_val & ~mask) | val;
+ ret = __tps6591x_write(tps6591x->client, reg, reg_val);
+ }
+out:
+ mutex_unlock(&tps6591x->lock);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(tps6591x_update);
+
+static struct i2c_client *tps6591x_i2c_client;
+int tps6591x_power_off(void)
+{
+ /* FIX ME */
+ return 0;
+}
+
+static int tps6591x_gpio_get(struct gpio_chip *gc, unsigned offset)
+{
+ struct tps6591x *tps6591x = container_of(gc, struct tps6591x, gpio);
+ uint8_t val;
+ int ret;
+
+ ret = __tps6591x_read(tps6591x->client, TPS6591X_GPIO_BASE_ADDR +
+ offset, &val);
+ if (ret)
+ return ret;
+
+ return val & 0x1;
+}
+
+static void tps6591x_gpio_set(struct gpio_chip *chip, unsigned offset,
+ int value)
+{
+
+ struct tps6591x *tps6591x = container_of(chip, struct tps6591x, gpio);
+
+ tps6591x_update(tps6591x->dev, TPS6591X_GPIO_BASE_ADDR + offset,
+ value, 0x1);
+}
+
+static int tps6591x_gpio_input(struct gpio_chip *gc, unsigned offset)
+{
+ /* FIXME: add handling of GPIOs as dedicated inputs */
+ return -ENOSYS;
+}
+
+static int tps6591x_gpio_output(struct gpio_chip *gc, unsigned offset,
+ int value)
+{
+ struct tps6591x *tps6591x = container_of(gc, struct tps6591x, gpio);
+ uint8_t reg_val, val;
+ int ret;
+
+ ret = __tps6591x_read(tps6591x->client, TPS6591X_GPIO_BASE_ADDR +
+ offset, &reg_val);
+ if (ret)
+ return ret;
+
+ val = (value & 0x1) | 0x4;
+ reg_val = reg_val | val;
+ return __tps6591x_write(tps6591x->client, TPS6591X_GPIO_BASE_ADDR +
+ offset, reg_val);
+}
+
+static void tps6591x_gpio_init(struct tps6591x *tps6591x, int gpio_base)
+{
+ int ret;
+
+ if (!gpio_base)
+ return;
+
+ tps6591x->gpio.owner = THIS_MODULE;
+ tps6591x->gpio.label = tps6591x->client->name;
+ tps6591x->gpio.dev = tps6591x->dev;
+ tps6591x->gpio.base = gpio_base;
+ tps6591x->gpio.ngpio = 9;
+ tps6591x->gpio.can_sleep = 1;
+
+ tps6591x->gpio.direction_input = tps6591x_gpio_input;
+ tps6591x->gpio.direction_output = tps6591x_gpio_output;
+ tps6591x->gpio.set = tps6591x_gpio_set;
+ tps6591x->gpio.get = tps6591x_gpio_get;
+
+ ret = gpiochip_add(&tps6591x->gpio);
+ if (ret)
+ dev_warn(tps6591x->dev, "GPIO registration failed: %d\n", ret);
+}
+
+static int __remove_subdev(struct device *dev, void *unused)
+{
+ platform_device_unregister(to_platform_device(dev));
+ return 0;
+}
+
+static int tps6591x_remove_subdevs(struct tps6591x *tps6591x)
+{
+ return device_for_each_child(tps6591x->dev, NULL, __remove_subdev);
+}
+
+static void tps6591x_irq_lock(unsigned int irq)
+{
+ struct tps6591x *tps6591x = get_irq_chip_data(irq);
+
+ mutex_lock(&tps6591x->irq_lock);
+}
+
+static void tps6591x_irq_enable(unsigned int irq)
+{
+ struct tps6591x *tps6591x = get_irq_chip_data(irq);
+ unsigned int __irq = irq - tps6591x->irq_base;
+ const struct tps6591x_irq_data *data = &tps6591x_irqs[__irq];
+
+ tps6591x->mask_reg[data->mask_reg] &= ~data->mask_mask;
+ tps6591x->irq_en |= (1 << __irq);
+}
+
+static void tps6591x_irq_disable(unsigned int irq)
+{
+ struct tps6591x *tps6591x = get_irq_chip_data(irq);
+
+ unsigned int __irq = irq - tps6591x->irq_base;
+ const struct tps6591x_irq_data *data = &tps6591x_irqs[__irq];
+
+ tps6591x->mask_reg[data->mask_reg] |= data->mask_mask;
+ tps6591x->irq_en &= ~(1 << __irq);
+}
+
+static void tps6591x_irq_sync_unlock(unsigned int irq)
+{
+ struct tps6591x *tps6591x = get_irq_chip_data(irq);
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(tps6591x->mask_reg); i++) {
+ if (tps6591x->mask_reg[i] != tps6591x->mask_cache[i]) {
+ if (!WARN_ON(tps6591x_write(tps6591x->dev,
+ TPS6591X_INT_MSK + i,
+ tps6591x->mask_reg[i])))
+ tps6591x->mask_cache[i] = tps6591x->mask_reg[i];
+ }
+ }
+
+ mutex_unlock(&tps6591x->irq_lock);
+}
+
+/* FIXME */
+static irqreturn_t tps6591x_irq(int irq, void *data)
+{
+ struct tps6591x *tps6591x = data;
+ int ret = 0;
+ u8 tmp[3];
+ int i;
+
+ for (i = 0; i < 3; i++) {
+ ret = tps6591x_read(tps6591x->dev, TPS6591X_INT_STS + 2*i,
+ &tmp[i]);
+ if (ret < 0) {
+ dev_err(tps6591x->dev, "failed to read interrupt status\n");
+ return IRQ_NONE;
+ }
+ ret = tps6591x_write(tps6591x->dev, TPS6591X_INT_STS + 2*i,
+ tmp[i]);
+ if (ret < 0) {
+ dev_err(tps6591x->dev, "failed to write interrupt status\n");
+ return IRQ_NONE;
+ }
+ }
+
+ return IRQ_HANDLED;
+}
+
+static int __devinit tps6591x_irq_init(struct tps6591x *tps6591x, int irq,
+ int irq_base)
+{
+ int i, ret;
+
+ if (!irq_base) {
+ dev_warn(tps6591x->dev, "No interrupt support on IRQ base\n");
+ return -EINVAL;
+ }
+
+ mutex_init(&tps6591x->irq_lock);
+ for (i = 0; i < 3; i++) {
+ tps6591x->mask_cache[i] = 0xff;
+ tps6591x->mask_reg[i] = 0xff;
+ tps6591x_write(tps6591x->dev, TPS6591X_INT_MSK + 2*i, 0xff);
+ }
+
+ for (i = 0; i < 3; i++)
+ tps6591x_write(tps6591x->dev, TPS6591X_INT_STS + 2*i, 0xff);
+
+ tps6591x->irq_base = irq_base;
+
+ tps6591x->irq_chip.name = "tps6591x";
+ tps6591x->irq_chip.enable = tps6591x_irq_enable;
+ tps6591x->irq_chip.disable = tps6591x_irq_disable;
+ tps6591x->irq_chip.bus_lock = tps6591x_irq_lock;
+ tps6591x->irq_chip.bus_sync_unlock = tps6591x_irq_sync_unlock;
+
+ for (i = 0; i < ARRAY_SIZE(tps6591x_irqs); i++) {
+ int __irq = i + tps6591x->irq_base;
+ set_irq_chip_data(__irq, tps6591x);
+ set_irq_chip_and_handler(__irq, &tps6591x->irq_chip,
+ handle_simple_irq);
+ set_irq_nested_thread(__irq, 1);
+#ifdef CONFIG_ARM
+ set_irq_flags(__irq, IRQF_VALID);
+#endif
+ }
+
+ ret = request_threaded_irq(irq, NULL, tps6591x_irq, IRQF_ONESHOT,
+ "tps6591x", tps6591x);
+
+ if (!ret) {
+ device_init_wakeup(tps6591x->dev, 1);
+ enable_irq_wake(irq);
+ }
+
+ return ret;
+}
+
+static int __devinit tps6591x_add_subdevs(struct tps6591x *tps6591x,
+ struct tps6591x_platform_data *pdata)
+{
+ struct tps6591x_subdev_info *subdev;
+ struct platform_device *pdev;
+ int i, ret = 0;
+
+ for (i = 0; i < pdata->num_subdevs; i++) {
+ subdev = &pdata->subdevs[i];
+
+ pdev = platform_device_alloc(subdev->name, subdev->id);
+
+ pdev->dev.parent = tps6591x->dev;
+ pdev->dev.platform_data = subdev->platform_data;
+
+ ret = platform_device_add(pdev);
+ if (ret)
+ goto failed;
+ }
+ return 0;
+
+failed:
+ tps6591x_remove_subdevs(tps6591x);
+ return ret;
+}
+
+static int __devinit tps6591x_i2c_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ struct tps6591x_platform_data *pdata = client->dev.platform_data;
+ struct tps6591x *tps6591x;
+ int ret;
+
+ if (!pdata) {
+ dev_err(&client->dev, "tps6591x requires platform data\n");
+ return -ENOTSUPP;
+ }
+
+ ret = i2c_smbus_read_byte_data(client, TPS6591X_VERNUM);
+ if (ret < 0) {
+ dev_err(&client->dev, "Silicon version number read"
+ " failed: %d\n", ret);
+ return -EIO;
+ }
+
+ dev_info(&client->dev, "VERNUM is %02x\n", ret);
+
+ tps6591x = kzalloc(sizeof(struct tps6591x), GFP_KERNEL);
+ if (tps6591x == NULL)
+ return -ENOMEM;
+
+ tps6591x->client = client;
+ tps6591x->dev = &client->dev;
+ i2c_set_clientdata(client, tps6591x);
+
+ mutex_init(&tps6591x->lock);
+
+ if (client->irq) {
+ ret = tps6591x_irq_init(tps6591x, client->irq,
+ pdata->irq_base);
+ if (ret) {
+ dev_err(&client->dev, "IRQ init failed: %d\n", ret);
+ goto err_irq_init;
+ }
+ }
+
+ ret = tps6591x_add_subdevs(tps6591x, pdata);
+ if (ret) {
+ dev_err(&client->dev, "add devices failed: %d\n", ret);
+ goto err_add_devs;
+ }
+
+ tps6591x_gpio_init(tps6591x, pdata->gpio_base);
+
+ tps6591x_i2c_client = client;
+
+ return 0;
+
+err_add_devs:
+ if (client->irq)
+ free_irq(client->irq, tps6591x);
+err_irq_init:
+ kfree(tps6591x);
+ return ret;
+}
+
+static int __devexit tps6591x_i2c_remove(struct i2c_client *client)
+{
+ struct tps6591x *tps6591x = i2c_get_clientdata(client);
+
+ if (client->irq)
+ free_irq(client->irq, tps6591x);
+
+ return 0;
+}
+
+static const struct i2c_device_id tps6591x_id_table[] = {
+ { "tps6591x", 0 },
+ { },
+};
+MODULE_DEVICE_TABLE(i2c, tps6591x_id_table);
+
+static struct i2c_driver tps6591x_driver = {
+ .driver = {
+ .name = "tps6591x",
+ .owner = THIS_MODULE,
+ },
+ .probe = tps6591x_i2c_probe,
+ .remove = __devexit_p(tps6591x_i2c_remove),
+ .id_table = tps6591x_id_table,
+};
+
+static int __init tps6591x_init(void)
+{
+ return i2c_add_driver(&tps6591x_driver);
+}
+subsys_initcall(tps6591x_init);
+
+static void __exit tps6591x_exit(void)
+{
+ i2c_del_driver(&tps6591x_driver);
+}
+module_exit(tps6591x_exit);
+
+MODULE_DESCRIPTION("TPS6591X core driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 82fba419f2f5..1bef3fdf429a 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -251,5 +251,12 @@ config REGULATOR_TPS6586X
help
This driver supports TPS6586X voltage regulator chips.
+config REGULATOR_TPS6591X
+ tristate "TI TPS6591X Power regulators"
+ depends on MFD_TPS6591X
+ default n
+ help
+ This driver supports TPS6591X voltage regulator chips.
+
endif
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 13ab9f9b09a0..61b35fb92292 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o
obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
+obj-$(CONFIG_REGULATOR_TPS6591X) += tps6591x-regulator.o
obj-$(CONFIG_REGULATOR_DA903X) += da903x.o
obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
diff --git a/drivers/regulator/tps6591x-regulator.c b/drivers/regulator/tps6591x-regulator.c
new file mode 100755
index 000000000000..89fcbf9301e9
--- /dev/null
+++ b/drivers/regulator/tps6591x-regulator.c
@@ -0,0 +1,597 @@
+/*
+ * driver/regulator/tps6591x-regulator.c
+ *
+ * Regulator driver for TI TPS6591x PMIC family
+ *
+ * Copyright (C) 2011 NVIDIA Corporation
+ *
+ * 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.
+ *
+ * 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, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/mfd/tps6591x.h>
+
+/* supply control and voltage setting */
+#define TPS6591X_VIO_ADD 0x20
+#define TPS6591X_VDD1_ADD 0x21
+#define TPS6591X_VDD1_OP_ADD 0x22
+#define TPS6591X_VDD1_SR_ADD 0x23
+#define TPS6591X_VDD2_ADD 0x24
+#define TPS6591X_VDD2_OP_ADD 0x25
+#define TPS6591X_VDD2_SR_ADD 0x26
+#define TPS6591X_VDDCTRL_ADD 0x27
+#define TPS6591X_VDDCTRL_OP_ADD 0x28
+#define TPS6591X_VDDCTRL_SR_ADD 0x29
+#define TPS6591X_LDO1_ADD 0x30
+#define TPS6591X_LDO2_ADD 0x31
+#define TPS6591X_LDO3_ADD 0x37
+#define TPS6591X_LDO4_ADD 0x36
+#define TPS6591X_LDO5_ADD 0x32
+#define TPS6591X_LDO6_ADD 0x35
+#define TPS6591X_LDO7_ADD 0x34
+#define TPS6591X_LDO8_ADD 0x33
+#define TPS6591X_INVALID_ADD 0xFF
+
+struct tps6591x_register_info {
+ unsigned char addr;
+ unsigned char nbits;
+ unsigned char shift_bits;
+};
+
+enum {
+ supply_type_none = 0x0,
+ supply_type_single_reg,
+ supply_type_sr_op_reg
+};
+
+struct tps6591x_regulator {
+ struct regulator_desc desc;
+ int supply_type;
+
+ struct tps6591x_register_info supply_reg;
+ struct tps6591x_register_info op_reg;
+ struct tps6591x_register_info sr_reg;
+
+ int *voltages;
+};
+
+static inline struct device *to_tps6591x_dev(struct regulator_dev *rdev)
+{
+ return rdev_get_dev(rdev)->parent->parent;
+}
+
+static int __tps6591x_vio_set_voltage(struct device *parent,
+ struct tps6591x_regulator *ri,
+ int min_uV, int max_uV)
+{
+ int uV;
+ uint8_t mask;
+ uint8_t val;
+
+ for (val = 0; val < ri->desc.n_voltages; val++) {
+ uV = ri->voltages[val] * 1000;
+
+ /* use the first in-range value */
+ if (min_uV <= uV && uV <= max_uV) {
+
+ val <<= ri->supply_reg.shift_bits;
+ mask = ((1 << ri->supply_reg.nbits) - 1) <<
+ ri->supply_reg.shift_bits;
+
+ return tps6591x_update(parent, ri->supply_reg.addr,
+ val, mask);
+ }
+ }
+
+ return -EINVAL;
+}
+
+static int tps6591x_vio_set_voltage(struct regulator_dev *rdev,
+ int min_uV, int max_uV)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+
+ return __tps6591x_vio_set_voltage(parent, ri, min_uV, max_uV);
+}
+
+static int tps6591x_vio_get_voltage(struct regulator_dev *rdev)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+ uint8_t val, mask;
+ int ret;
+
+ ret = tps6591x_read(parent, ri->supply_reg.addr, &val);
+ if (ret)
+ return ret;
+
+ mask = ((1 << ri->supply_reg.nbits) - 1) << ri->supply_reg.shift_bits;
+ val = (val & mask) >> ri->supply_reg.shift_bits;
+
+ if (val >= ri->desc.n_voltages)
+ BUG();
+
+ return ri->voltages[val] * 1000;
+}
+
+
+static int tps6591x_ldo_list_voltage(struct regulator_dev *rdev,
+ unsigned selector)
+{
+ struct tps6591x_regulator *info = rdev_get_drvdata(rdev);
+
+ return info->voltages[selector] * 1000;
+}
+
+static int __tps6591x_ldo1_set_voltage(struct device *parent,
+ struct tps6591x_regulator *ri,
+ int min_uV, int max_uV)
+{
+ int val, uV;
+ uint8_t mask;
+
+ for (val = 0; val < ri->desc.n_voltages; val++) {
+ uV = ri->voltages[val] * 1000;
+
+ /* use the first in-range value */
+ if (min_uV <= uV && uV <= max_uV) {
+ val += 4;
+ val <<= ri->supply_reg.shift_bits;
+ mask = ((1 << ri->supply_reg.nbits) - 1) <<
+ ri->supply_reg.shift_bits;
+
+ return tps6591x_update(parent, ri->supply_reg.addr,
+ val, mask);
+ }
+ }
+
+ return -EINVAL;
+}
+
+static int tps6591x_ldo1_set_voltage(struct regulator_dev *rdev,
+ int min_uV, int max_uV)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+
+ return __tps6591x_ldo1_set_voltage(parent, ri, min_uV, max_uV);
+}
+
+static int tps6591x_ldo1_get_voltage(struct regulator_dev *rdev)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+ uint8_t val, mask;
+ int ret;
+
+ ret = tps6591x_read(parent, ri->supply_reg.addr, &val);
+ if (ret)
+ return ret;
+
+ mask = ((1 << ri->supply_reg.nbits) - 1) << ri->supply_reg.shift_bits;
+ val = (val & mask) >> ri->supply_reg.shift_bits;
+
+ if (val < 4)
+ return 1000 * 1000;
+ else if (val > 0x32)
+ return 3300 * 1000;
+ else
+ val -= 4;
+ if (val >= ri->desc.n_voltages)
+ BUG();
+
+ return ri->voltages[val] * 1000;
+}
+
+static int __tps6591x_ldo3_set_voltage(struct device *parent,
+ struct tps6591x_regulator *ri, int min_uV, int max_uV)
+{
+ int val, uV;
+ uint8_t mask;
+
+ for (val = 0; val < ri->desc.n_voltages; val++) {
+ uV = ri->voltages[val] * 1000;
+
+ /* use the first in-range value */
+ if (min_uV <= uV && uV <= max_uV) {
+ val += 2;
+ val <<= ri->supply_reg.shift_bits;
+ mask = ((1 << ri->supply_reg.nbits) - 1) <<
+ ri->supply_reg.shift_bits;
+
+ return tps6591x_update(parent, ri->supply_reg.addr,
+ val, mask);
+ }
+ }
+
+ return -EINVAL;
+}
+
+static int tps6591x_ldo3_set_voltage(struct regulator_dev *rdev,
+ int min_uV, int max_uV)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+
+ return __tps6591x_ldo3_set_voltage(parent, ri, min_uV, max_uV);
+}
+
+static int tps6591x_ldo3_get_voltage(struct regulator_dev *rdev)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+ uint8_t val, mask;
+ int ret;
+
+ ret = tps6591x_read(parent, ri->supply_reg.addr, &val);
+ if (ret)
+ return ret;
+
+ mask = ((1 << ri->supply_reg.nbits) - 1) << ri->supply_reg.shift_bits;
+ val = (val & mask) >> ri->supply_reg.shift_bits;
+
+ if (val < 2)
+ return 1000 * 1000;
+ else if (val > 0x19)
+ return 3300 * 1000;
+ else
+ val -= 2;
+ if (val >= ri->desc.n_voltages)
+ BUG();
+
+ return ri->voltages[val] * 1000;
+}
+
+static int __tps6591x_vdd_set_voltage(struct device *parent,
+ struct tps6591x_regulator *ri,
+ int min_uV, int max_uV)
+{
+ int val, uV, ret;
+ uint8_t mask, reg_val;
+
+ for (val = 0; val < ri->desc.n_voltages; val++) {
+ uV = ri->voltages[val] * 1000;
+
+ /* use the first in-range value */
+ if (min_uV <= uV && uV <= max_uV) {
+ ret = tps6591x_read(parent, ri->op_reg.addr, &reg_val);
+ if (ret)
+ return ret;
+ val += 3;
+ if (reg_val & 0x80) {
+ val <<= ri->sr_reg.shift_bits;
+ mask = ((1 << ri->sr_reg.nbits) - 1)
+ << ri->sr_reg.shift_bits;
+ return tps6591x_update(parent,
+ ri->sr_reg.addr, val, mask);
+ } else {
+ val <<= ri->op_reg.shift_bits;
+ mask = ((1 << ri->op_reg.nbits) - 1)
+ << ri->op_reg.shift_bits;
+ return tps6591x_update(parent,
+ ri->op_reg.addr, val, mask);
+ }
+ }
+ }
+
+ return -EINVAL;
+}
+
+static int tps6591x_vdd_set_voltage(struct regulator_dev *rdev,
+ int min_uV, int max_uV)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+
+ return __tps6591x_vdd_set_voltage(parent, ri, min_uV, max_uV);
+}
+
+static int tps6591x_vdd_get_voltage(struct regulator_dev *rdev)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+ uint8_t op_val, sr_val, val;
+ int ret;
+
+ ret = tps6591x_read(parent, ri->op_reg.addr, &op_val);
+ if (ret)
+ return ret;
+
+ ret = tps6591x_read(parent, ri->sr_reg.addr, &sr_val);
+ if (ret)
+ return ret;
+
+ val = (op_val & 0x80) ? (sr_val & 0x7F) : (op_val & 0x7F);
+
+ if (!val)
+ return 0;
+ else if (val < 0x3)
+ return 600 * 1000;
+ else if (val > 0x4B)
+ return 1500 * 1000;
+ else
+ val -= 3;
+
+ if (val >= ri->desc.n_voltages)
+ BUG();
+
+ return ri->voltages[val] * 1000;
+}
+
+static int tps6591x_regulator_enable(struct regulator_dev *rdev)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+
+ return tps6591x_set_bits(parent, ri->supply_reg.addr, 0x1);
+}
+
+static int tps6591x_regulator_disable(struct regulator_dev *rdev)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+
+ return tps6591x_clr_bits(parent, ri->supply_reg.addr, 0x1);
+}
+
+static int tps6591x_regulator_is_enabled(struct regulator_dev *rdev)
+{
+ struct tps6591x_regulator *ri = rdev_get_drvdata(rdev);
+ struct device *parent = to_tps6591x_dev(rdev);
+ uint8_t reg_val;
+ int ret;
+
+ ret = tps6591x_read(parent, ri->supply_reg.addr, &reg_val);
+ if (ret)
+ return ret;
+
+ return !!(reg_val & 0x1);
+}
+
+static struct regulator_ops tps6591x_regulator_vio_ops = {
+ .list_voltage = tps6591x_ldo_list_voltage,
+ .get_voltage = tps6591x_vio_get_voltage,
+ .set_voltage = tps6591x_vio_set_voltage,
+
+ .is_enabled = tps6591x_regulator_is_enabled,
+ .enable = tps6591x_regulator_enable,
+ .disable = tps6591x_regulator_disable,
+};
+
+static struct regulator_ops tps6591x_regulator_ldo1_ops = {
+ .list_voltage = tps6591x_ldo_list_voltage,
+ .get_voltage = tps6591x_ldo1_get_voltage,
+ .set_voltage = tps6591x_ldo1_set_voltage,
+
+ .is_enabled = tps6591x_regulator_is_enabled,
+ .enable = tps6591x_regulator_enable,
+ .disable = tps6591x_regulator_disable,
+};
+
+static struct regulator_ops tps6591x_regulator_ldo3_ops = {
+ .list_voltage = tps6591x_ldo_list_voltage,
+ .get_voltage = tps6591x_ldo3_get_voltage,
+ .set_voltage = tps6591x_ldo3_set_voltage,
+
+ .is_enabled = tps6591x_regulator_is_enabled,
+ .enable = tps6591x_regulator_enable,
+ .disable = tps6591x_regulator_disable,
+};
+
+static struct regulator_ops tps6591x_regulator_vdd_ops = {
+ .list_voltage = tps6591x_ldo_list_voltage,
+ .get_voltage = tps6591x_vdd_get_voltage,
+ .set_voltage = tps6591x_vdd_set_voltage,
+
+ .is_enabled = tps6591x_regulator_is_enabled,
+ .enable = tps6591x_regulator_enable,
+ .disable = tps6591x_regulator_disable,
+};
+
+static int tps6591x_vio_voltages[] = {
+ 1500, 1800, 2500, 3300,
+};
+
+/* SEL[7:2]=000100:1000mV --> 110010:3300mV */
+static int tps6591x_ldo124_voltages[] = {
+ 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350, 1400, 1450,
+ 1500, 1550, 1600, 1650, 1700, 1750, 1800, 1850, 1900, 1950,
+ 2000, 2050, 2100, 2150, 2200, 2250, 2300, 2350, 2400, 2450,
+ 2500, 2550, 2600, 2650, 2700, 2750, 2800, 2850, 2900, 2950,
+ 3000, 3050, 3100, 3150, 3200, 3250, 3300,
+};
+
+/* SEL[6:2]=00010:1000mv --> 11001:3300mV */
+static int tps6591x_ldo35678_voltages[] = {
+ 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900,
+ 2000, 2100, 2200, 2300, 2400, 2500, 2600, 2700, 2800, 2900,
+ 3000, 3100, 3200, 3300,
+};
+
+static int tps6591x_vdd_voltages[] = {
+ 600, 612, 625, 637, 650, 662, 675, 687, 700, 712, 725, 737,
+ 750, 762, 775, 787, 800, 812, 825, 837, 850, 862, 875, 887,
+ 900, 912, 925, 937, 950, 962, 975, 987, 1000, 1012, 1025,
+ 1037, 1050, 1062, 1075, 1087, 1100, 1112, 1125, 1137, 1150,
+ 1162, 1175, 1187, 1200, 1212, 1225, 1237, 1250, 1262, 1275,
+ 1287, 1300, 1312, 1325, 1337, 1350, 1362, 1375, 1387, 1400,
+ 1412, 1425, 1437, 1450, 1462, 1475, 1487, 1500,
+};
+
+#define TPS6591X_REGULATOR(_id, vdata, _ops, s_addr, s_nbits, s_shift, \
+ s_type, op_addr, op_nbits, op_shift, sr_addr, \
+ sr_nbits, sr_shift) \
+ .desc = { \
+ .name = tps6591x_rails(_id), \
+ .ops = &tps6591x_regulator_##_ops, \
+ .type = REGULATOR_VOLTAGE, \
+ .id = TPS6591X_ID_##_id, \
+ .n_voltages = ARRAY_SIZE(tps6591x_##vdata##_voltages), \
+ .owner = THIS_MODULE, \
+ }, \
+ .supply_type = supply_type_##s_type, \
+ .supply_reg = { \
+ .addr = TPS6591X_##s_addr##_ADD, \
+ .nbits = s_nbits, \
+ .shift_bits = s_shift, \
+ }, \
+ .op_reg = { \
+ .addr = TPS6591X_##op_addr##_ADD, \
+ .nbits = op_nbits, \
+ .shift_bits = op_shift, \
+ }, \
+ .sr_reg = { \
+ .addr = TPS6591X_##sr_addr##_ADD, \
+ .nbits = sr_nbits, \
+ .shift_bits = sr_shift, \
+ }, \
+ .voltages = tps6591x_##vdata##_voltages,
+
+#define TPS6591X_VIO(_id, vdata, s_addr, s_nbits, s_shift, s_type) \
+{ \
+ TPS6591X_REGULATOR(_id, vdata, vio_ops, s_addr, s_nbits, \
+ s_shift, s_type, INVALID, 0, 0, INVALID, 0, 0) \
+}
+
+#define TPS6591X_LDO1(_id, vdata, s_addr, s_nbits, s_shift, s_type) \
+{ \
+ TPS6591X_REGULATOR(_id, vdata, ldo1_ops, s_addr, s_nbits, \
+ s_shift, s_type, INVALID, 0, 0, INVALID, 0, 0) \
+}
+
+#define TPS6591X_LDO3(_id, vdata, s_addr, s_nbits, s_shift, s_type) \
+{ \
+ TPS6591X_REGULATOR(_id, vdata, ldo3_ops, s_addr, s_nbits, \
+ s_shift, s_type, INVALID, 0, 0, INVALID, 0, 0) \
+}
+
+#define TPS6591X_VDD(_id, vdata, s_addr, s_nbits, s_shift, s_type, \
+ op_addr, op_nbits, op_shift, sr_addr, sr_nbits, \
+ sr_shift) \
+{ \
+ TPS6591X_REGULATOR(_id, vdata, vdd_ops, s_addr, s_nbits, \
+ s_shift, s_type, op_addr, op_nbits, op_shift, \
+ sr_addr, sr_nbits, sr_shift) \
+}
+
+static struct tps6591x_regulator tps6591x_regulator[] = {
+ TPS6591X_VIO(VIO, vio, VIO, 2, 2, single_reg),
+ TPS6591X_LDO1(LDO_1, ldo124, LDO1, 6, 2, single_reg),
+ TPS6591X_LDO1(LDO_2, ldo124, LDO2, 6, 2, single_reg),
+ TPS6591X_LDO3(LDO_3, ldo35678, LDO3, 5, 2, single_reg),
+ TPS6591X_LDO1(LDO_4, ldo124, LDO4, 6, 2, single_reg),
+ TPS6591X_LDO3(LDO_5, ldo35678, LDO5, 5, 2, single_reg),
+ TPS6591X_LDO3(LDO_6, ldo35678, LDO6, 5, 2, single_reg),
+ TPS6591X_LDO3(LDO_7, ldo35678, LDO7, 5, 2, single_reg),
+ TPS6591X_LDO3(LDO_8, ldo35678, LDO8, 5, 2, single_reg),
+ TPS6591X_VDD(VDD_1, vdd, VDD1, 2, 0, sr_op_reg, VDD1_OP,
+ 7, 0, VDD1_SR, 7, 0),
+ TPS6591X_VDD(VDD_2, vdd, VDD2, 2, 0, sr_op_reg, VDD2_OP,
+ 7, 0, VDD2_SR, 7, 0),
+ TPS6591X_VDD(VDDCTRL, vdd, VDDCTRL, 2, 0, sr_op_reg,
+ VDDCTRL_OP, 7, 0, VDDCTRL_SR, 7, 0),
+};
+
+static inline int tps6591x_regulator_preinit(struct device *parent,
+ struct tps6591x_regulator *ri)
+{
+ return tps6591x_set_bits(parent, ri->supply_reg.addr, 0x1);
+}
+
+static inline struct tps6591x_regulator *find_regulator_info(int id)
+{
+ struct tps6591x_regulator *ri;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(tps6591x_regulator); i++) {
+ ri = &tps6591x_regulator[i];
+ if (ri->desc.id == id)
+ return ri;
+ }
+ return NULL;
+}
+
+static int __devinit tps6591x_regulator_probe(struct platform_device *pdev)
+{
+ struct tps6591x_regulator *ri = NULL;
+ struct regulator_dev *rdev;
+ int id = pdev->id;
+ int err;
+
+ dev_dbg(&pdev->dev, "Probing reulator %d\n", id);
+
+ ri = find_regulator_info(id);
+ if (ri == NULL) {
+ dev_err(&pdev->dev, "invalid regulator ID specified\n");
+ return -EINVAL;
+ }
+
+ err = tps6591x_regulator_preinit(pdev->dev.parent, ri);
+ if (err)
+ return err;
+
+ rdev = regulator_register(&ri->desc, &pdev->dev,
+ pdev->dev.platform_data, ri);
+ if (IS_ERR_OR_NULL(rdev)) {
+ dev_err(&pdev->dev, "failed to register regulator %s\n",
+ ri->desc.name);
+ return PTR_ERR(rdev);
+ }
+
+ platform_set_drvdata(pdev, rdev);
+
+ return 0;
+}
+
+static int __devexit tps6591x_regulator_remove(struct platform_device *pdev)
+{
+ struct regulator_dev *rdev = platform_get_drvdata(pdev);
+
+ regulator_unregister(rdev);
+ return 0;
+}
+
+static struct platform_driver tps6591x_regulator_driver = {
+ .driver = {
+ .name = "tps6591x-regulator",
+ .owner = THIS_MODULE,
+ },
+ .probe = tps6591x_regulator_probe,
+ .remove = __devexit_p(tps6591x_regulator_remove),
+};
+
+static int __init tps6591x_regulator_init(void)
+{
+ return platform_driver_register(&tps6591x_regulator_driver);
+}
+subsys_initcall(tps6591x_regulator_init);
+
+static void __exit tps6591x_regulator_exit(void)
+{
+ platform_driver_unregister(&tps6591x_regulator_driver);
+}
+module_exit(tps6591x_regulator_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Regulator Driver for TI TPS6591X PMIC");
+MODULE_ALIAS("platform:tps6591x-regulator");
diff --git a/include/linux/mfd/tps6591x.h b/include/linux/mfd/tps6591x.h
new file mode 100755
index 000000000000..b88044d35fb6
--- /dev/null
+++ b/include/linux/mfd/tps6591x.h
@@ -0,0 +1,102 @@
+/*
+ * include/linux/mfd/tps6591x.c
+ * Core driver interface for TI TPS6591x PMIC family
+ *
+ * Copyright (C) 2011 NVIDIA Corporation
+ *
+ * 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.
+ *
+ * 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, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef __LINUX_MFD_TPS6591X_H
+#define __LINUX_MFD_TPS6591X_H
+
+#define tps6591x_rails(_name) "tps6591x_"#_name
+
+enum {
+ TPS6591X_ID_VIO,
+ TPS6591X_ID_VDD_1,
+ TPS6591X_ID_VDD_2,
+ TPS6591X_ID_VDDCTRL,
+ TPS6591X_ID_LDO_1,
+ TPS6591X_ID_LDO_2,
+ TPS6591X_ID_LDO_3,
+ TPS6591X_ID_LDO_4,
+ TPS6591X_ID_LDO_5,
+ TPS6591X_ID_LDO_6,
+ TPS6591X_ID_LDO_7,
+ TPS6591X_ID_LDO_8,
+};
+
+enum {
+ TPS6591X_INT_PWRHOLD_F,
+ TPS6591X_INT_VMBHI,
+ TPS6591X_INT_PWRON,
+ TPS6591X_INT_PWRON_LP,
+ TPS6591X_INT_PWRHOLD_R,
+ TPS6591X_INT_HOTDIE,
+ TPS6591X_INT_RTC_ALARM,
+ TPS6591X_INT_RTC_PERIOD,
+ TPS6591X_INT_GPIO0_R,
+ TPS6591X_INT_GPIO0_F,
+ TPS6591X_INT_GPIO1_R,
+ TPS6591X_INT_GPIO1_F,
+ TPS6591X_INT_GPIO2_R,
+ TPS6591X_INT_GPIO2_F,
+ TPS6591X_INT_GPIO3_R,
+ TPS6591X_INT_GPIO3_F,
+ TPS6591X_INT_GPIO4_R,
+ TPS6591X_INT_GPIO4_F,
+ TPS6591X_INT_GPIO5_R,
+ TPS6591X_INT_GPIO5_F,
+ TPS6591X_INT_WTCHDG,
+ TPS6591X_INT_VMBCH2_H,
+ TPS6591X_INT_VMBCH2_L,
+ TPS6591X_INT_PWRDN,
+};
+
+struct tps6591x_subdev_info {
+ int id;
+ const char *name;
+ void *platform_data;
+};
+
+struct tps6591x_rtc_platform_data {
+ int irq;
+};
+
+struct tps6591x_platform_data {
+ int num_subdevs;
+ struct tps6591x_subdev_info *subdevs;
+
+ int gpio_base;
+ int irq_base;
+};
+
+/*
+ * NOTE: the functions below are not intended for use outside
+ * of the TPS6591X sub-device drivers
+ */
+extern int tps6591x_write(struct device *dev, int reg, uint8_t val);
+extern int tps6591x_writes(struct device *dev, int reg, int len, uint8_t *val);
+extern int tps6591x_read(struct device *dev, int reg, uint8_t *val);
+extern int tps6591x_reads(struct device *dev, int reg, int len, uint8_t *val);
+extern int tps6591x_set_bits(struct device *dev, int reg, uint8_t bit_mask);
+extern int tps6591x_clr_bits(struct device *dev, int reg, uint8_t bit_mask);
+extern int tps6591x_update(struct device *dev, int reg, uint8_t val,
+ uint8_t mask);
+extern int tps6591x_power_off(void);
+
+#endif /*__LINUX_MFD_TPS6591X_H */