From a8ff5cd6259db07e518aa6aad396740f01d7c284 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 25 Jul 2011 22:20:33 +0100
Subject: [PATCH] --- yaml --- r: 262162 b: refs/heads/master c:
 c439b8f46ee79147139e124621dbc9e1e7804655 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/regulator/wm831x-dcdc.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aab8aef40820..69df498e8538 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b47ba9fdd336b318a6a6431e6a4556df99272277
+refs/heads/master: c439b8f46ee79147139e124621dbc9e1e7804655
diff --git a/trunk/drivers/regulator/wm831x-dcdc.c b/trunk/drivers/regulator/wm831x-dcdc.c
index 95249f7a0e39..2c5d54b026c9 100644
--- a/trunk/drivers/regulator/wm831x-dcdc.c
+++ b/trunk/drivers/regulator/wm831x-dcdc.c
@@ -491,6 +491,20 @@ static __devinit void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc,
 		return;
 	}
 
+	/* If DVS_VSEL is set to the minimum value then raise it to ON_VSEL
+	 * to make bootstrapping a bit smoother.
+	 */
+	if (!dcdc->dvs_vsel) {
+		ret = wm831x_set_bits(wm831x,
+				      dcdc->base + WM831X_DCDC_DVS_CONTROL,
+				      WM831X_DC1_DVS_VSEL_MASK, dcdc->on_vsel);
+		if (ret == 0)
+			dcdc->dvs_vsel = dcdc->on_vsel;
+		else
+			dev_warn(wm831x->dev, "Failed to set DVS_VSEL: %d\n",
+				 ret);
+	}
+
 	ret = wm831x_set_bits(wm831x, dcdc->base + WM831X_DCDC_DVS_CONTROL,
 			      WM831X_DC1_DVS_SRC_MASK, ctrl);
 	if (ret < 0) {