From 3dbb0a5f2624c89e2d8343f33a6acf147991ca89 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 24 Jul 2011 12:40:48 +0100
Subject: [PATCH] --- yaml --- r: 270800 b: refs/heads/master c:
 a1ff89ef3cd6515d378f946db5f3760089bb644e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4b4c50c02935..e1f9cf3611e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f6d45f121ba190f87c67503a73d8ff2ffa3e946
+refs/heads/master: a1ff89ef3cd6515d378f946db5f3760089bb644e
diff --git a/trunk/drivers/regulator/wm8994-regulator.c b/trunk/drivers/regulator/wm8994-regulator.c
index 1a6a690f24db..b87bf5c841f8 100644
--- a/trunk/drivers/regulator/wm8994-regulator.c
+++ b/trunk/drivers/regulator/wm8994-regulator.c
@@ -140,6 +140,14 @@ static int wm8994_ldo2_list_voltage(struct regulator_dev *rdev,
 		return (selector * 100000) + 900000;
 	case WM8958:
 		return (selector * 100000) + 1000000;
+	case WM1811:
+		switch (selector) {
+		case 0:
+			return -EINVAL;
+		default:
+			return (selector * 100000) + 950000;
+		}
+		break;
 	default:
 		return -EINVAL;
 	}
@@ -170,6 +178,11 @@ static int wm8994_ldo2_set_voltage(struct regulator_dev *rdev,
 	case WM8958:
 		selector = (min_uV - 1000000) / 100000;
 		break;
+	case WM1811:
+		selector = (min_uV - 950000) / 100000;
+		if (selector == 0)
+			selector = 1;
+		break;
 	default:
 		return -EINVAL;
 	}