regulator: ab8500: Initialize Vrf1 regulator

Vrf1 regulator is put in HW control at initialization. Forcing
this regulator to HW control in suspend is removed.

Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Martin PERSSON <martin.persson@stericsson.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 0cc9edc690ffd0546a5b33637c6c2621bad44854..ba379f78c58a9110e11b9a3540c0b360db6f7782 100644 (file)
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -275,9 +275,10 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
         */
        INIT_REGULATOR_REGISTER(AB8500_VAUX12REGU, 0x01),
        /*
-        * Vaux3regu                = force off
+        * Vrf1Regu                 = HW control
+        * Vaux3Regu                = force off
         */
-       INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x00),
+       INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x08),
        /*
         * Vsmps1                   = 1.15V
         */

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index ac07fc84f99e38d8e0176c31c1c8939ba41753ec..b36941171ea3446d8e96f783bc4d00990564cbee 100644 (file)
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -619,9 +619,10 @@ static struct ab8500_reg_init ab8500_reg_init[] = {
         */
        REG_INIT(AB8500_VAUX12REGU,             0x04, 0x09, 0x0f),
        /*
+        * 0x0c, Vrf1Regu
         * 0x03, Vaux3Regu
         */
-       REG_INIT(AB8500_VRF1VAUX3REGU,          0x04, 0x0a, 0x03),
+       REG_INIT(AB8500_VRF1VAUX3REGU,          0x04, 0x0a, 0x0f),
        /*
         * 0x3f, Vsmps1Sel1
         */