diff options
| author | Bengt Jonsson <bengt.g.jonsson@stericsson.com> | 2011-03-23 18:58:35 +0100 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-03-25 19:04:59 +0100 |
| commit | 5646e5e2762eaf58dc83c399936922a2b8c960c9 (patch) | |
| tree | c51705ba983a991a5f0449eaaeb614bb9c1cb694 /drivers/regulator | |
| parent | e4e2f9556c57b9f10555298a4be456e8a36c1245 (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')
| -rw-r--r-- | drivers/regulator/ab8500-debug.c | 28 | ||||
| -rw-r--r-- | drivers/regulator/ab8500.c | 21 |
2 files changed, 18 insertions, 31 deletions
diff --git a/drivers/regulator/ab8500-debug.c b/drivers/regulator/ab8500-debug.c index 5646fcc11cc..b03f7b1b1fa 100644 --- a/drivers/regulator/ab8500-debug.c +++ b/drivers/regulator/ab8500-debug.c @@ -1506,34 +1506,6 @@ static struct ab8500_force_reg ab8500_force_reg[] = { }, { /* - * ReguSysClkReq1HPValid1 - * OTP: 0x00, HSI: 0x16, suspend: 0x17/0xff (value/mask) - * [ 4] VpllSysClkReq1HPValid = Vpll set by SysClkReq1 - * [ 2] Vsmps3SysClkReq1HPValid = Vsmps3 set by SysClkReq1 - * [ 1] Vsmps2SysClkReq1HPValid = Vsmsp2 set by SysClkReq1 - * [ 0] Vsmps1SysClkReq1HPValid = Vsmps1 set by SysClkReq1 - */ - .name = "ReguSysClkReq1HPValid1", - .bank = 0x03, - .addr = 0x07, - .mask = 0x17, - .val = 0x17, - }, - { - /* - * Vsmsp3Regu - * OTP: 0x01, HSI: 0x01, suspend: 0x06/0x0f (value/mask) - * [3:2] Vsmps3SelCtrl[1:0] = Vsmps3 voltage set by Vsmps3Sel2 - * [1:0] Vsmps3Regu[1:0] = Vsmps3 in HW control - */ - .name = "Vsmps3Regu", - .bank = 0x04, - .addr = 0x05, - .mask = 0x0f, - .val = 0x06, - }, - { - /* * SysUlpClkCtrl1 * OTP: 0x00, HSI: 0x00, suspend: 0x00/0x0f (value/mask) * [ 3] 4500SysClkReq = inactive diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index e9395094cc5..d4d8c641378 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -548,13 +548,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 @@ -651,16 +652,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 */ @@ -693,6 +700,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), |