From f5d0b400dafbcd03b682d82c569ed89b7bd74806 Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Wed, 8 Jul 2009 17:57:24 +0800
Subject: [PATCH] --- yaml --- r: 165375 b: refs/heads/master c:
 fc4f42e7fb021340c14dfd726313be6cfdeab19e h: refs/heads/master i:   165373:
 a0f85708fb465e8ed1d2bd65592501885fbf36bd   165371:
 3ab31c77ea89b476dbc9ee9db162999b7c4032c4   165367:
 643c760de0df98d2228ba8f56280f513d1c94315   165359:
 32baf476643b772454ac8e7b5cbf661ac5fbeecb   165343:
 0304309bde9590405ad8f31f308631e7e48d3c8e   165311:
 008cc6de490fbd1a0366acc9e9b5c54049fe849e   165247:
 a60fed7f2c6d2299e6853f260864849a0da36579   165119:
 750278026300e03c4be2cd07d55ad7ae5b41c0e3   164863:
 2e05ccbbf71351aebbc2ab5976b95343b41d6c15 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/regulator/da903x.c | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3136497f8432..9bc62c785450 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0198d1163b3e0313b3f073b62384abfab1a17cff
+refs/heads/master: fc4f42e7fb021340c14dfd726313be6cfdeab19e
diff --git a/trunk/drivers/regulator/da903x.c b/trunk/drivers/regulator/da903x.c
index 33dfeeb9407c..49081b44bf52 100644
--- a/trunk/drivers/regulator/da903x.c
+++ b/trunk/drivers/regulator/da903x.c
@@ -375,6 +375,27 @@ static struct regulator_ops da9034_regulator_ldo12_ops = {
 	.enable_bit	= (ebit),					\
 }
 
+#define DA9030_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \
+{									\
+	.desc	= {							\
+		.name	= #_id,						\
+		.ops	= &da9034_regulator_dvc_ops,			\
+		.type	= REGULATOR_VOLTAGE,				\
+		.id	= DA9030_ID_##_id,				\
+		.owner	= THIS_MODULE,					\
+	},								\
+	.min_uV		= (min) * 1000,					\
+	.max_uV		= (max) * 1000,					\
+	.step_uV	= (step) * 1000,				\
+	.vol_reg	= DA9030_##vreg,				\
+	.vol_shift	= (0),						\
+	.vol_nbits	= (nbits),					\
+	.update_reg	= DA9030_##ureg,				\
+	.update_bit	= (ubit),					\
+	.enable_reg	= DA9030_##ereg,				\
+	.enable_bit	= (ebit),					\
+}
+
 #define DA9034_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \
 {									\
 	.desc	= {							\
@@ -425,6 +446,8 @@ static struct regulator_ops da9034_regulator_ldo12_ops = {
 
 static struct da903x_regulator_info da903x_regulator_info[] = {
 	/* DA9030 */
+	DA9030_DVC(BUCK2, 850, 1625, 25, BUCK2DVM1, 5, BUCK2DVM1, 7, RCTL11, 0),
+
 	DA9030_LDO( 1, 1200, 3200, 100,    LDO1, 0, 5, RCTL12, 1),
 	DA9030_LDO( 2, 1800, 3200, 100,   LDO23, 0, 4, RCTL12, 2),
 	DA9030_LDO( 3, 1800, 3200, 100,   LDO23, 4, 4, RCTL12, 3),