diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-04 16:58:36 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:14:56 +0200 |
| commit | f9175a3fd7f21fac04a32225360f938fe48578ac (patch) | |
| tree | b96aa18a779aa748f6f099c143bfce3f4758c87f | |
| parent | 84110570a80022197d4a58027f164ac4cdb37837 (diff) | |
regulators: add init values for vsmps1/2
Change-Id: I65fb79ad78680d575cfe52b55f1ab98e441b0b0c
Signed-off-by: Martin Persson <martin.persson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17878
Reviewed-by: Emeric VIGIER <emeric.vigier@stericsson.com>
Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
Conflicts:
arch/arm/mach-ux500/board-mop500-regulators.c
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 14 | ||||
| -rw-r--r-- | drivers/regulator/ab8500.c | 14 | ||||
| -rw-r--r-- | include/linux/regulator/ab8500.h | 2 |
3 files changed, 28 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 13e8a85c317..bdc01c0a3c5 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -153,8 +153,10 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { * Vaux1SysClkReq1HPValid = disabled * Vaux2SysClkReq1HPValid = disabled * Vaux3SysClkReq1HPValid = disabled + * Vsmps2SysClkReq1HPValid = enabled + * Vsmps1SysClkReq1HPValid = enabled */ - INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x00), + INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03), /* * VextSupply1SysClkReq1HPValid = disabled * VextSupply2SysClkReq1HPValid = disabled @@ -259,6 +261,16 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = { */ INIT_REGULATOR_REGISTER(AB8500_VBBSEL2, 0x00), /* + * Vsmps1SelCtrl = Vsmps1 voltage defined by Vsmsp1Sel2 + * Vsmps1Regu = HW control + */ + INIT_REGULATOR_REGISTER(AB8500_VSMPS1REGU, 0x06), + /* + * Vsmps2SelCtrl = Vsmps2 voltage defined by Vsmsp2Sel2 + * Vsmps2Regu = HW control + */ + INIT_REGULATOR_REGISTER(AB8500_VSMPS2REGU, 0x06), + /* * VPll = Hw controlled * VanaRegu = force off */ diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index e95a654d56a..192650a9a4c 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -589,12 +589,14 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_REGUREQUESTCTRL4, 0x03, 0x06, 0x07), /* + * 0x01, Vsmps1SysClkReq1HPValid + * 0x02, Vsmps2SysClkReq1HPValid * 0x08, VanaSysClkReq1HPValid * 0x20, Vaux1SysClkReq1HPValid * 0x40, Vaux2SysClkReq1HPValid * 0x80, Vaux3SysClkReq1HPValid */ - REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xe8), + REG_INIT(AB8500_REGUSYSCLKREQ1HPVALID1, 0x03, 0x07, 0xeb), /* * 0x10, VextSupply1SysClkReq1HPValid * 0x20, VextSupply2SysClkReq1HPValid @@ -691,6 +693,16 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_VBBSEL2, 0x04, 0x12, 0x0f), /* + * 0x0c, Vsmps1SelCtrl + * 0x03, Vsmps1Regu + */ + REG_INIT(AB8500_VSMPS1REGU, 0x04, 0x03, 0x0f), + /* + * 0x0c, Vsmps2SelCtrl + * 0x03, Vsmps2Regu + */ + REG_INIT(AB8500_VSMPS2REGU, 0x04, 0x04, 0x0f), + /* * 0x0c, VanaRegu * 0x03, VpllRegu */ diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 4b53341c61a..f10563d9767 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -70,6 +70,8 @@ enum ab8500_regulator_reg { AB8500_ARMREGU2, /* NOTE! PRCMU register */ AB8500_VBBSEL1, /* NOTE! PRCMU register */ AB8500_VBBSEL2, /* NOTE! PRCMU register */ + AB8500_VSMPS1REGU, + AB8500_VSMPS2REGU, AB8500_VSMPS1SEL1, AB8500_NUM_REGULATOR_REGISTERS, }; |