From 5cb2ade288561358bc8e5680850283a77910638b Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 28 Mar 2013 16:11:04 +0000
Subject: [PATCH] --- yaml --- r: 365051 b: refs/heads/master c:
 422d765d2cb9a22ded86d8b63a1701e296436b81 h: refs/heads/master i:   365049:
 45c967cc5582fe90b93c7c6db41660db644a756c   365047:
 7fd37c75c4e1221bba89c2504be17e7238f96094 v: v3

---
 [refs]                                          |  2 +-
 .../arm/mach-ux500/board-mop500-regulators.c    | 17 +++++++++++++++++
 .../arm/mach-ux500/board-mop500-regulators.h    |  2 ++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ce1e23f9bc69..0d4b944d592d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1d494806698ae37c14b0c7fe9e6165e3b0c146c
+refs/heads/master: 422d765d2cb9a22ded86d8b63a1701e296436b81
diff --git a/trunk/arch/arm/mach-ux500/board-mop500-regulators.c b/trunk/arch/arm/mach-ux500/board-mop500-regulators.c
index 22dfaf3d979a..2a2751e4aa8a 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/trunk/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/ab8500.h>
+#include <mach/id.h> /* to identify older boards for fixes */
 #include "board-mop500-regulators.h"
 
 static struct regulator_consumer_supply gpio_en_3v3_consumers[] = {
@@ -494,3 +495,19 @@ static void ab8500_modify_reg_init(int id, u8 mask, u8 value)
 
 	BUG_ON(1);
 }
+
+void mop500_regulator_init(void)
+{
+	struct regulator_init_data *regulator;
+
+	/*
+	 * Handle VextSupply1 on older boards than HREFP_V22_V1x
+	 * (turn off in suspend)
+	 */
+	if (cpu_is_u8500v20() || cpu_is_u8500v21()) {
+		/* disable VextSupply1 in suspend */
+		regulator = &ab8500_ext_regulators[AB8500_EXT_SUPPLY1];
+		regulator->constraints.state_mem.disabled = 1;
+		regulator->constraints.state_standby.disabled = 1;
+	}
+}
diff --git a/trunk/arch/arm/mach-ux500/board-mop500-regulators.h b/trunk/arch/arm/mach-ux500/board-mop500-regulators.h
index 9ca4869a6f23..3d4c412d0b7a 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500-regulators.h
+++ b/trunk/arch/arm/mach-ux500/board-mop500-regulators.h
@@ -18,4 +18,6 @@ extern struct ab8500_regulator_platform_data ab8500_regulator_plat_data;
 extern struct regulator_init_data tps61052_regulator;
 extern struct regulator_init_data gpio_en_3v3_regulator;
 
+void mop500_regulator_init(void);
+
 #endif