Re: [PATCH] regulator: tps65218: add support for LS3 current regulator

[Lee Jones]

On Wed, 25 Nov 2015, Nikita Kiryanov wrote:

> Add support for TPS65218 LS3 current regulator, which is capable of 4
> current input limit modes: 100, 200, 500, and 1000 uA.
> 
> Signed-off-by: Nikita Kiryanov 
> Cc: Tony Lindgren 
> Cc: Liam Girdwood 
> Cc: Mark Brown 
> Cc: Samuel Ortiz 
> Cc: Lee Jones 
> ---
>  drivers/regulator/tps65218-regulator.c | 137 
> +
>  include/linux/mfd/tps65218.h   |   7 +-

Acked-by: Lee Jones 

>  include/linux/regulator/driver.h   |   2 +
>  3 files changed, 115 insertions(+), 31 deletions(-)

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] regulator: tps65218: add support for LS3 current regulator

[Nikita Kiryanov]

Add support for TPS65218 LS3 current regulator, which is capable of 4
current input limit modes: 100, 200, 500, and 1000 uA.

Signed-off-by: Nikita Kiryanov 
Cc: Tony Lindgren 
Cc: Liam Girdwood 
Cc: Mark Brown 
Cc: Samuel Ortiz 
Cc: Lee Jones 
---
 drivers/regulator/tps65218-regulator.c | 137 +
 include/linux/mfd/tps65218.h   |   7 +-
 include/linux/regulator/driver.h   |   2 +
 3 files changed, 115 insertions(+), 31 deletions(-)

diff --git a/drivers/regulator/tps65218-regulator.c 
b/drivers/regulator/tps65218-regulator.c
index 7f97223..d88eb57 100644
--- a/drivers/regulator/tps65218-regulator.c
+++ b/drivers/regulator/tps65218-regulator.c
@@ -27,19 +27,22 @@
 #include 
 #include 
 
-enum tps65218_regulators { DCDC1, DCDC2, DCDC3, DCDC4, DCDC5, DCDC6, LDO1 };
+enum tps65218_regulators { DCDC1, DCDC2, DCDC3, DCDC4,
+  DCDC5, DCDC6, LDO1, LS3 };
 
-#define TPS65218_REGULATOR(_name, _id, _ops, _n, _vr, _vm, _er, _em, \
-   _lr, _nlr, _delay, _fuv)\
+#define TPS65218_REGULATOR(_name, _id, _type, _ops, _n, _vr, _vm, _er, _em, \
+   _cr, _cm, _lr, _nlr, _delay, _fuv)  \
{   \
.name   = _name,\
.id = _id,  \
.ops= &_ops,\
.n_voltages = _n,   \
-   .type   = REGULATOR_VOLTAGE,\
+   .type   = _type,\
.owner  = THIS_MODULE,  \
.vsel_reg   = _vr,  \
.vsel_mask  = _vm,  \
+   .csel_reg   = _cr,  \
+   .csel_mask  = _cm,  \
.enable_reg = _er,  \
.enable_mask= _em,  \
.volt_table = NULL, \
@@ -80,6 +83,7 @@ static struct tps_info tps65218_pmic_regs[] = {
TPS65218_INFO(DCDC5, "DCDC5", 100, 100),
TPS65218_INFO(DCDC6, "DCDC6", 180, 180),
TPS65218_INFO(LDO1, "LDO1", 90, 340),
+   TPS65218_INFO(LS3, "LS3", -1, -1),
 };
 
 #define TPS65218_OF_MATCH(comp, label) \
@@ -96,6 +100,7 @@ static const struct of_device_id tps65218_of_match[] = {
TPS65218_OF_MATCH("ti,tps65218-dcdc5", tps65218_pmic_regs[DCDC5]),
TPS65218_OF_MATCH("ti,tps65218-dcdc6", tps65218_pmic_regs[DCDC6]),
TPS65218_OF_MATCH("ti,tps65218-ldo1", tps65218_pmic_regs[LDO1]),
+   TPS65218_OF_MATCH("ti,tps65218-ls3", tps65218_pmic_regs[LS3]),
{ }
 };
 MODULE_DEVICE_TABLE(of, tps65218_of_match);
@@ -175,6 +180,68 @@ static struct regulator_ops tps65218_ldo1_dcdc34_ops = {
.map_voltage= regulator_map_voltage_linear_range,
 };
 
+static const int ls3_currents[] = { 100, 200, 500, 1000 };
+
+static int tps65218_pmic_set_input_current_lim(struct regulator_dev *dev,
+  int lim_uA)
+{
+   unsigned int index = 0;
+   unsigned int num_currents = ARRAY_SIZE(ls3_currents);
+   struct tps65218 *tps = rdev_get_drvdata(dev);
+
+   while (index < num_currents && ls3_currents[index] != lim_uA)
+   index++;
+
+   if (index == num_currents)
+   return -EINVAL;
+
+   return tps65218_set_bits(tps, dev->desc->csel_reg, dev->desc->csel_mask,
+index << 2, TPS65218_PROTECT_L1);
+}
+
+static int tps65218_pmic_set_current_limit(struct regulator_dev *dev,
+  int min_uA, int max_uA)
+{
+   int index = 0;
+   unsigned int num_currents = ARRAY_SIZE(ls3_currents);
+   struct tps65218 *tps = rdev_get_drvdata(dev);
+
+   while (index < num_currents && ls3_currents[index] < max_uA)
+   index++;
+
+   index--;
+
+   if (index < 0 || ls3_currents[index] < min_uA)
+   return -EINVAL;
+
+   return tps65218_set_bits(tps, dev->desc->csel_reg, dev->desc->csel_mask,
+index << 2, TPS65218_PROTECT_L1);
+}
+
+static int tps65218_pmic_get_current_limit(struct regulator_dev *dev)
+{
+   int retval;
+   unsigned int index;
+   struct tps65218 *tps = rdev_get_drvdata(dev);
+
+   retval = tps65218_reg_read(tps, dev->desc->csel_reg, );
+   if (retval < 0)
+   return retval;
+
+   index = (index & dev->desc->csel_mask) >> 2;
+
+   return ls3_currents[index];
+}
+
+static struct regulator_ops tps65218_ls3_ops = {
+