diff options
| author | Bengt Jonsson <bengt.g.jonsson@stericsson.com> | 2011-03-23 18:58:35 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:01 +0200 |
| commit | bc7c33949542d8700e62161343e6c8e8d9218265 (patch) | |
| tree | f8dcb45a249a1b0320f176ad6a416f1e06f7b6e3 /arch/arm/mach-ux500/board-mop500-regulators.c | |
| parent | 0bacd4f4c404cfdbba8f4824e61ebb1bbf33c682 (diff) | |
ARM: ux500: Vsmps3 controlled by SysClkReq1
Vsmps3 is put in HW control by SysClkReq1 at init. The
corresponding settings in suspend-force are removed.
ST-Ericsson Linux next: -
ST-Ericsson ID: ER326467
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I4d20ed770fe931919f5bd0bf68d53cb69a19bf89
Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18985
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-regulators.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 5e8855b964c..f8995efd865 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -168,15 +168,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 - * Vsmps2SysClkReq1HPValid = enabled - * Vsmps1SysClkReq1HPValid = enabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x13), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x17), /* * VextSupply1SysClkReq1HPValid = disabled * VextSupply2SysClkReq1HPValid = disabled @@ -281,16 +282,32 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { */ INIT_REGULATOR_REGISTER(AB8500_VBBSEL2, 0x00), /* - * Vsmps1SelCtrl = Vsmps1 voltage defined by Vsmsp1Sel2 * Vsmps1Regu = HW control + * Vsmps1SelCtrl = Vsmps1 voltage defined by Vsmsp1Sel2 */ INIT_REGULATOR_REGISTER(AB8500_VSMPS1REGU, 0x06), /* - * Vsmps2SelCtrl = Vsmps2 voltage defined by Vsmsp2Sel2 * Vsmps2Regu = HW control + * Vsmps2SelCtrl = Vsmps2 voltage defined by Vsmsp2Sel2 */ INIT_REGULATOR_REGISTER(AB8500_VSMPS2REGU, 0x06), /* + * Vsmps3Sel2 = 1.2125 V + * NOTE! PRCMU register + */ + INIT_REGULATOR_REGISTER(AB8500_VSMPS3SEL2, 0x29), + /* + * Vsmps3Regu = HW control + * Vsmps3SelCtrl = Vsmps3 voltage defined by Vsmps3Sel2 + * NOTE! PRCMU register + */ + INIT_REGULATOR_REGISTER(AB8500_VSMPS3REGU, 0x06), + /* + * Vsmps3Sel1 = 0.9 V + * NOTE! PRCMU register + */ + INIT_REGULATOR_REGISTER(AB8500_VSMPS3SEL1, 0x10), + /* * VPll = Hw controlled * VanaRegu = force off */ |