summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBengt Jonsson <bengt.g.jonsson@stericsson.com>2012-01-25 09:12:00 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:30 +0200
commitd513fd1d1a7963c39da32171a0bee45b180187f2 (patch)
treee5424bafa65229fce7daeebc9bcbc5eddbe07ef3
parenteb244486c4a709fcd2306f2f7d3851b57898543e (diff)
ux500: regulator: Enable Vaux2 on 8520
ST-Ericsson Linux next: - ST-Ericsson ID: 371953 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ief21eef4e5ca13da5c8dd748366bbe48ad4b3466 Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/47885
-rw-r--r--arch/arm/mach-ux500/board-mop500-regulators.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 4eafb6ddb7d..972b6431db0 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -12,6 +12,7 @@
#include <linux/regulator/machine.h>
#include <linux/regulator/ab8500.h>
#include <mach/id.h> /* to identify older boards for fixes */
+#include <asm/mach-types.h>
#include "board-mop500-regulators.h"
#ifdef CONFIG_REGULATOR_FIXED_VOLTAGE
@@ -587,6 +588,18 @@ void mop500_regulator_init(void)
struct regulator_init_data *regulator;
/*
+ * Temporarily turn on Vaux2 on 8520 machine
+ */
+ if (machine_is_u8520()) {
+ /* Vaux2 initialized to be on */
+ ab8500_modify_reg_init(AB8500_VAUX12REGU, 0x0f, 0x05);
+
+ /* Vaux2 always on */
+ regulator = &ab8500_ext_regulators[AB8500_LDO_AUX2];
+ regulator->constraints.always_on = 1;
+ }
+
+ /*
* Handle AB8500_EXT_SUPPLY2 on HREFP_V20_V50 boards (do it for
* all HREFP_V20 boards)
*/