summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBengt Jonsson <bengt.g.jonsson@stericsson.com>2011-12-08 16:10:24 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:25 +0200
commit8d7e15cf95bc093fa4a518b75ef45b18df7688c2 (patch)
tree6f7b391910f6ce5af3a55781da728a4f8fc2742f
parentab14159c93b339522b10f5b6f366f2e6cc589362 (diff)
regulator: ab8500: Remove Vsafe voltage settings
The Vsafe regulator should not be handled by the kernel, it should be setup before the kernel starts. This patch removes the voltage settings. Current consumption will increase slightly (rough estimate 25 uA) when the platform is in the low power state because SoC sets a voltage of 0.95 V where the kernel set a voltage of 0.925 V. ST-Ericsson ID: 366482 ST-Ericsson Linux next: - ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ia8a1033c5ceca2f7fe04ac30215406d954e0cae8 Depends-on: If3b3c22371e448d79e65e600e9472637cf17ddc6 Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/42849 Reviewed-by: QABUILD
-rw-r--r--arch/arm/mach-ux500/board-mop500-regulators.c10
-rw-r--r--drivers/regulator/ab8500.c10
-rw-r--r--include/linux/regulator/ab8500.h2
3 files changed, 0 insertions, 22 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 4167ea82d0d..bc80c3fc0c1 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -314,22 +314,12 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = {
*/
INIT_REGULATOR_REGISTER(AB8500_VSMPS2REGU, 0x0f, 0x06),
/*
- * Vsmps3Sel2 = 1.2125 V
- * NOTE! PRCMU register
- */
- INIT_REGULATOR_REGISTER(AB8500_VSMPS3SEL2, 0x7f, 0x29),
- /*
* Vsmps3Regu = HW control
* Vsmps3SelCtrl = Vsmps3 voltage defined by Vsmps3Sel2
* NOTE! PRCMU register
*/
INIT_REGULATOR_REGISTER(AB8500_VSMPS3REGU, 0x0f, 0x06),
/*
- * Vsmps3Sel1 = 0.925V
- * NOTE! PRCMU register
- */
- INIT_REGULATOR_REGISTER(AB8500_VSMPS3SEL1, 0x7f, 0x12),
- /*
* VPll = Hw controlled
* VanaRegu = force off
*/
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 24cb3f1030b..3d400d877d6 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -1016,16 +1016,6 @@ static struct ab8500_reg_init ab8500_reg_init[] = {
*/
REG_INIT(AB8500_VSMPS2SEL3, 0x04, 0x19, 0x3f),
/*
- * 0x7f, Vsmps3Sel1
- * NOTE! PRCMU register
- */
- REG_INIT(AB8500_VSMPS3SEL1, 0x04, 0x1b, 0x7f),
- /*
- * 0x7f, Vsmps3Sel2
- * NOTE! PRCMU register
- */
- REG_INIT(AB8500_VSMPS3SEL2, 0x04, 0x1c, 0x7f),
- /*
* 0x0f, Vaux1Sel
*/
REG_INIT(AB8500_VAUX1SEL, 0x04, 0x1f, 0x0f),
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 79f03f3897a..7f6ca3aa4c1 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -95,8 +95,6 @@ enum ab8500_regulator_reg {
AB8500_VSMPS2SEL1,
AB8500_VSMPS2SEL2,
AB8500_VSMPS2SEL3,
- AB8500_VSMPS3SEL1, /* NOTE! PRCMU register */
- AB8500_VSMPS3SEL2, /* NOTE! PRCMU register */
AB8500_VAUX1SEL,
AB8500_VAUX2SEL,
AB8500_VRF1VAUX3SEL,