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 /drivers/regulator/ab8500.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 'drivers/regulator/ab8500.c')
| -rw-r--r-- | drivers/regulator/ab8500.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 19952694308..40d84a745e7 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -591,13 +591,14 @@ static struct ab8500_reg_init ab8500_reg_init[] = { /* * 0x01, Vsmps1SysClkReq1HPValid * 0x02, Vsmps2SysClkReq1HPValid + * 0x04, Vsmps3SysClkReq1HPValid * 0x08, VanaSysClkReq1HPValid * 0x10, VpllSysClkReq1HPValid * 0x20, Vaux1SysClkReq1HPValid * 0x40, Vaux2SysClkReq1HPValid * 0x80, Vaux3SysClkReq1HPValid */ - REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xfb), + REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xff), /* * 0x10, VextSupply1SysClkReq1HPValid * 0x20, VextSupply2SysClkReq1HPValid @@ -694,16 +695,22 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_VBBSEL2, 0x04, 0x12, 0x0f), /* - * 0x0c, Vsmps1SelCtrl * 0x03, Vsmps1Regu + * 0x0c, Vsmps1SelCtrl */ REG_INIT(AB8500_VSMPS1REGU, 0x04, 0x03, 0x0f), /* - * 0x0c, Vsmps2SelCtrl * 0x03, Vsmps2Regu + * 0x0c, Vsmps2SelCtrl */ REG_INIT(AB8500_VSMPS2REGU, 0x04, 0x04, 0x0f), /* + * 0x03, Vsmps3Regu + * 0x0c, Vsmps3SelCtrl + * NOTE! PRCMU register + */ + REG_INIT(AB8500_VSMPS3REGU, 0x04, 0x05, 0x0f), + /* * 0x0c, VanaRegu * 0x03, VpllRegu */ @@ -736,6 +743,14 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_VSMPS1SEL1, 0x04, 0x13, 0x3f), /* + * 0x7f, Vsmps3Sel1 + */ + REG_INIT(AB8500_VSMPS3SEL1, 0x04, 0x1b, 0x7f), + /* + * 0x7f, Vsmps3Sel2 + */ + REG_INIT(AB8500_VSMPS3SEL2, 0x04, 0x1c, 0x7f), + /* * 0x0f, Vaux1Sel */ REG_INIT(AB8500_VAUX1SEL, 0x04, 0x1f, 0x0f), |