diff options
| author | Bengt Jonsson <bengt.g.jonsson@stericsson.com> | 2011-12-08 16:11:08 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 10:59:26 +0200 |
| commit | 7e218cc88703e6ea588760ed56cbfe5a00abf0a5 (patch) | |
| tree | 959a0657a51e5f15d22ea218a90e903f79e3a7b3 | |
| parent | 8d7e15cf95bc093fa4a518b75ef45b18df7688c2 (diff) | |
regulator: ab8500: Remove Vsafe settings
The Vsafe regulator should not be handled
by kernel, it should be setup before the
kernel starts. This patch removes the
setting of Vsmsp3Regu.
ST-Ericsson ID: 366482
ST-Ericsson Linux next: -
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I47af8002c0c06eb373f353aafa6f76f5ed1c1944
Depends-on: I3ef3dfa93946baffe019292084948e7c052b85c2
Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/42850
Reviewed-by: QABUILD
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 6 | ||||
| -rw-r--r-- | drivers/regulator/ab8500.c | 6 | ||||
| -rw-r--r-- | include/linux/regulator/ab8500.h | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index bc80c3fc0c1..72052093f82 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -314,12 +314,6 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = { */ INIT_REGULATOR_REGISTER(AB8500_VSMPS2REGU, 0x0f, 0x06), /* - * Vsmps3Regu = HW control - * Vsmps3SelCtrl = Vsmps3 voltage defined by Vsmps3Sel2 - * NOTE! PRCMU register - */ - INIT_REGULATOR_REGISTER(AB8500_VSMPS3REGU, 0x0f, 0x06), - /* * VPll = Hw controlled * VanaRegu = force off */ diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 3d400d877d6..a2a2d2b34bf 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -958,12 +958,6 @@ static struct ab8500_reg_init ab8500_reg_init[] = { */ REG_INIT(AB8500_VSMPS2REGU, 0x04, 0x04, 0x3f), /* - * 0x03, Vsmps3Regu - * 0x0c, Vsmps3SelCtrl - * NOTE! PRCMU register - */ - REG_INIT(AB8500_VSMPS3REGU, 0x04, 0x05, 0x0f), - /* * 0x03, VpllRegu * 0x0c, VanaRegu */ diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 7f6ca3aa4c1..c2634eb2d81 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -83,7 +83,6 @@ enum ab8500_regulator_reg { AB8500_REGUCTRL1VAMIC, AB8500_VSMPS1REGU, AB8500_VSMPS2REGU, - AB8500_VSMPS3REGU, /* NOTE! PRCMU register */ AB8500_VPLLVANAREGU, AB8500_VREFDDR, AB8500_EXTSUPPLYREGU, |