3 files changed, 394 insertions, 0 deletions

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 6c14afd258b0..93bf5fe5660c 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -229,5 +229,11 @@ config REGULATOR_AB8500
           This driver supports the regulators found on the ST-Ericsson mixed
           signal AB8500 PMIC
 
+config REGULATOR_TPS6586X
+        tristate "TI TPS6586X Power regulators"
+        depends on I2C
+        help
+          This driver supports TPS6586X voltage regulator chips.
+
 endif
 
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index fc696c50ee56..8285fd832e16 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
 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_DA903X)  += da903x.o
 obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
 obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
new file mode 100644
index 000000000000..76cc41ecbdf7
--- /dev/null
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -0,0 +1,387 @@
+/*
+ * Regulator driver for TI TPS6586x
+ *
+ * Copyright (C) 2010 Compulab Ltd.
+ * Author: Mike Rapoport <mike@compulab.co.il>
+ *
+ * Based on da903x
+ * Copyright (C) 2006-2008 Marvell International Ltd.
+ * Copyright (C) 2008 Compulab Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#define DEBUG
+#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/tps6586x.h>
+
+/* supply control and voltage setting  */
+#define TPS6586X_SUPPLYENA      0x10
+#define TPS6586X_SUPPLYENB      0x11
+#define TPS6586X_SUPPLYENC      0x12
+#define TPS6586X_SUPPLYEND      0x13
+#define TPS6586X_SUPPLYENE      0x14
+#define TPS6586X_VCC1           0x20
+#define TPS6586X_VCC2           0x21
+#define TPS6586X_SM1V1          0x23
+#define TPS6586X_SM1V2          0x24
+#define TPS6586X_SM1SL          0x25
+#define TPS6586X_SM0V1          0x26
+#define TPS6586X_SM0V2          0x27
+#define TPS6586X_SM0SL          0x28
+#define TPS6586X_LDO2AV1        0x29
+#define TPS6586X_LDO2AV2        0x2A
+#define TPS6586X_LDO2BV1        0x2F
+#define TPS6586X_LDO2BV2        0x30
+#define TPS6586X_LDO4V1         0x32
+#define TPS6586X_LDO4V2         0x33
+
+/* converter settings  */
+#define TPS6586X_SUPPLYV1       0x41
+#define TPS6586X_SUPPLYV2       0x42
+#define TPS6586X_SUPPLYV3       0x43
+#define TPS6586X_SUPPLYV4       0x44
+#define TPS6586X_SUPPLYV5       0x45
+#define TPS6586X_SUPPLYV6       0x46
+#define TPS6586X_SMODE1         0x47
+#define TPS6586X_SMODE2         0x48
+
+struct tps6586x_regulator {
+        struct regulator_desc desc;
+
+        int volt_reg;
+        int volt_shift;
+        int volt_nbits;
+        int enable_bit[2];
+        int enable_reg[2];
+
+        int *voltages;
+
+        /* for DVM regulators */
+        int go_reg;
+        int go_bit;
+};
+
+static inline struct device *to_tps6586x_dev(struct regulator_dev *rdev)
+{
+        return rdev_get_dev(rdev)->parent->parent;
+}
+
+static int tps6586x_ldo_list_voltage(struct regulator_dev *rdev,
+                                     unsigned selector)
+{
+        struct tps6586x_regulator *info = rdev_get_drvdata(rdev);
+
+        return info->voltages[selector];
+}
+
+
+static int __tps6586x_ldo_set_voltage(struct device *parent,
+                                      struct tps6586x_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;
+
+                /* LDO0 has minimal voltage 1.2 rather than 1.25 */
+                if (ri->desc.id == TPS6586X_ID_LDO_0 && val == 0)
+                        uV -= 50 * 1000;
+
+                /* use the first in-range value */
+                if (min_uV <= uV && uV <= max_uV) {
+
+                        val <<= ri->volt_shift;
+                        mask = ((1 << ri->volt_nbits) - 1) << ri->volt_shift;
+
+                        return tps6586x_update(parent, ri->volt_reg, val, mask);
+                }
+        }
+
+        return -EINVAL;
+}
+
+static int tps6586x_ldo_set_voltage(struct regulator_dev *rdev,
+                                    int min_uV, int max_uV)
+{
+        struct tps6586x_regulator *ri = rdev_get_drvdata(rdev);
+        struct device *parent = to_tps6586x_dev(rdev);
+
+        return __tps6586x_ldo_set_voltage(parent, ri, min_uV, max_uV);
+}
+
+static int tps6586x_ldo_get_voltage(struct regulator_dev *rdev)
+{
+        struct tps6586x_regulator *ri = rdev_get_drvdata(rdev);
+        struct device *parent = to_tps6586x_dev(rdev);
+        uint8_t val, mask;
+        int ret;
+
+        ret = tps6586x_read(parent, ri->volt_reg, &val);
+        if (ret)
+                return ret;
+
+        mask = ((1 << ri->volt_nbits) - 1) << ri->volt_shift;
+        val = (val & mask) >> ri->volt_shift;
+
+        if (val > ri->desc.n_voltages)
+                BUG();
+
+        return ri->voltages[val];
+}
+
+static int tps6586x_dvm_set_voltage(struct regulator_dev *rdev,
+                                    int min_uV, int max_uV)
+{
+        struct tps6586x_regulator *ri = rdev_get_drvdata(rdev);
+        struct device *parent = to_tps6586x_dev(rdev);
+        int ret;
+
+        ret = __tps6586x_ldo_set_voltage(parent, ri, min_uV, max_uV);
+        if (ret)
+                return ret;
+
+        return tps6586x_set_bits(parent, ri->go_reg, ri->go_bit);
+}
+
+static int tps6586x_regulator_enable(struct regulator_dev *rdev)
+{
+        struct tps6586x_regulator *ri = rdev_get_drvdata(rdev);
+        struct device *parent = to_tps6586x_dev(rdev);
+
+        return tps6586x_set_bits(parent, ri->enable_reg[0],
+                                 1 << ri->enable_bit[0]);
+}
+