regulator: ab8500: Further populate initialisation registers

This patch supplies access to some extra settings provided by the
AB8500 regulator device. We also update some of the existing
initialisation values in accordance with internal ST-Ericsson code
submissions. This single patch was originally a collection of updates
which have been squashed together to aid with clarity.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 37 insertions, 3 deletions

diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 2a17bc506cff..4b3c51905071 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -126,6 +126,7 @@ struct ab8500_regulator_reg_init
 ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
         /*
          * VanaRequestCtrl          = HP/LP depending on VxRequest
+         * VpllRequestCtrl          = HP/LP depending on VxRequest
          * VextSupply1RequestCtrl   = HP/LP depending on VxRequest
          */
         INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL2, 0x00),
@@ -142,12 +143,16 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
          */
         INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL4, 0x00),
         /*
+         * Vsmps1SysClkReq1HPValid  = enabled
+         * Vsmps2SysClkReq1HPValid  = enabled
+         * Vsmps3SysClkReq1HPValid  = enabled
          * VanaSysClkReq1HPValid    = disabled
+         * VpllSysClkReq1HPValid    = enabled
          * Vaux1SysClkReq1HPValid   = disabled
          * Vaux2SysClkReq1HPValid   = disabled
          * Vaux3SysClkReq1HPValid   = disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x17),
         /*
          * VextSupply1SysClkReq1HPValid = disabled
          * VextSupply2SysClkReq1HPValid = disabled
@@ -234,6 +239,34 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
          */
         INIT_REGULATOR_REGISTER(AB8500_REGUCTRL1VAMIC, 0x00),
         /*
+         * VBBN                     = force OFF
+         * VBBP                     = force OFF
+         * NOTE! PRCMU register
+         */
+        INIT_REGULATOR_REGISTER(AB8500_ARMREGU2,               0x00),
+        /*
+         * VBBNSel1                 = VBBP = VBBPFB
+         * VBBPSel1                 = 0 V
+         * NOTE! PRCMU register
+         */
+        INIT_REGULATOR_REGISTER(AB8500_VBBSEL1,                0x00),
+        /*
+         * VBBNSel2                 = VBBP = VBBPFB
+         * VBBPSel2                 = 0 V
+         * NOTE! PRCMU register
+         */
+        INIT_REGULATOR_REGISTER(AB8500_VBBSEL2,                0x00),
+        /*
+         * Vsmps1Regu               = HW control
+         * Vsmps1SelCtrl            = Vsmps1 voltage defined by Vsmsp1Sel2
+         */
+        INIT_REGULATOR_REGISTER(AB8500_VSMPS1REGU,             0x06),
+        /*
+         * Vsmps2Regu               = HW control
+         * Vsmps2SelCtrl            = Vsmps2 voltage defined by Vsmsp2Sel2
+         */
+        INIT_REGULATOR_REGISTER(AB8500_VSMPS2REGU,             0x06),
+        /*
          * VPll                     = Hw controlled
          * VanaRegu                 = force off
          */
@@ -257,9 +290,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
          */