Re: [PATCH v3 1/7] regulator: tps65218: Add fixed_uV fields for dcdc5 and dcdc6

2014-07-09 Thread Mark Brown 
On Wed, Jul 09, 2014 at 11:06:27AM +0530, Keerthy wrote:
 Add fixed_uV fields for dcdc5 and dcdc6.

This doesn't apply against current code, can you please check and
resend?  There were some cleanups from Felipe that just went in, it
looks like a collision with them.


signature.asc
Description: Digital signature

Re: [PATCH v3 1/7] regulator: tps65218: Add fixed_uV fields for dcdc5 and dcdc6

2014-07-09 Thread Keerthy 

On Wednesday 09 July 2014 02:44 PM, Mark Brown wrote:

On Wed, Jul 09, 2014 at 11:06:27AM +0530, Keerthy wrote:

Add fixed_uV fields for dcdc5 and dcdc6.

This doesn't apply against current code, can you please check and
resend?  There were some cleanups from Felipe that just went in, it
looks like a collision with them.

Yup. They touch the same lines. Those patches were not yet taken
before i posted. I will rebase and post.

Thanks,
Keerthy
--
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 v3 1/7] regulator: tps65218: Add fixed_uV fields for dcdc5 and dcdc6

2014-07-08 Thread Keerthy 
Add fixed_uV fields for dcdc5 and dcdc6.

Signed-off-by: Keerthy j-keer...@ti.com
---

Changes from V2:
  * Added fixed_uV fields for the regulator_desc structures.

 drivers/regulator/tps65218-regulator.c |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/regulator/tps65218-regulator.c 
b/drivers/regulator/tps65218-regulator.c
index 9effe48..27dc70d 100644
--- a/drivers/regulator/tps65218-regulator.c
+++ b/drivers/regulator/tps65218-regulator.c
@@ -30,7 +30,7 @@
 enum tps65218_regulators { DCDC1, DCDC2, DCDC3, DCDC4, DCDC5, DCDC6, LDO1 };
 
 #define TPS65218_REGULATOR(_name, _id, _ops, _n, _vr, _vm, _er, _em, _t, \
-   _lr, _nlr, _delay)  \
+   _lr, _nlr, _delay, _fuv)\
{   \
.name   = _name,\
.id = _id,  \
@@ -46,6 +46,7 @@ enum tps65218_regulators { DCDC1, DCDC2, DCDC3, DCDC4, DCDC5, 
DCDC6, LDO1 };
.linear_ranges  = _lr,  \
.n_linear_ranges= _nlr, \
.ramp_delay = _delay,   \
+   .fixed_uV   = _fuv  \
}   \
 
 #define TPS65218_INFO(_id, _nm, _min, _max)\
@@ -186,33 +187,33 @@ static const struct regulator_desc regulators[] = {
   TPS65218_REG_CONTROL_DCDC1,
   TPS65218_CONTROL_DCDC1_MASK,
   TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC1_EN, NULL,
-  dcdc1_dcdc2_ranges, 2, 4000),
+  dcdc1_dcdc2_ranges, 2, 4000, 0),
TPS65218_REGULATOR(DCDC2, TPS65218_DCDC_2, tps65218_dcdc12_ops, 64,
   TPS65218_REG_CONTROL_DCDC2,
   TPS65218_CONTROL_DCDC2_MASK,
   TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC2_EN, NULL,
-  dcdc1_dcdc2_ranges, 2, 4000),
+  dcdc1_dcdc2_ranges, 2, 4000, 0),
TPS65218_REGULATOR(DCDC3, TPS65218_DCDC_3, tps65218_ldo1_dcdc34_ops,
   64, TPS65218_REG_CONTROL_DCDC3,
   TPS65218_CONTROL_DCDC3_MASK, TPS65218_REG_ENABLE1,
   TPS65218_ENABLE1_DC3_EN, NULL,
-  ldo1_dcdc3_ranges, 2, 0),
+  ldo1_dcdc3_ranges, 2, 0, 0),
TPS65218_REGULATOR(DCDC4, TPS65218_DCDC_4, tps65218_ldo1_dcdc34_ops,
   53, TPS65218_REG_CONTROL_DCDC4,
   TPS65218_CONTROL_DCDC4_MASK,
   TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC4_EN, NULL,
-  dcdc4_ranges, 2, 0),
+  dcdc4_ranges, 2, 0, 0),
TPS65218_REGULATOR(DCDC5, TPS65218_DCDC_5, tps65218_dcdc56_pmic_ops,
   1, -1, -1, TPS65218_REG_ENABLE1,
-  TPS65218_ENABLE1_DC5_EN, NULL, NULL, 0, 0),
+  TPS65218_ENABLE1_DC5_EN, NULL, NULL, 0, 0, 100),
TPS65218_REGULATOR(DCDC6, TPS65218_DCDC_6, tps65218_dcdc56_pmic_ops,
   1, -1, -1, TPS65218_REG_ENABLE1,
-  TPS65218_ENABLE1_DC6_EN, NULL, NULL, 0, 0),
+  TPS65218_ENABLE1_DC6_EN, NULL, NULL, 0, 0, 180),
TPS65218_REGULATOR(LDO1, TPS65218_LDO_1, tps65218_ldo1_dcdc34_ops, 64,
   TPS65218_REG_CONTROL_LDO1,
   TPS65218_CONTROL_LDO1_MASK, TPS65218_REG_ENABLE2,
   TPS65218_ENABLE2_LDO1_EN, NULL, ldo1_dcdc3_ranges,
-  2, 0),
+  2, 0, 0),
 };
 
 static int tps65218_regulator_probe(struct platform_device *pdev)
-- 
1.7.9.5

--
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