diff mbox

[31/73] regulator: ab8500: Remove Vsafe settings

Message ID 1359978868-28736-32-git-send-email-lee.jones@linaro.org
State New
Headers show

Commit Message

Lee Jones Feb. 4, 2013, 11:53 a.m. UTC 
From: Bengt Jonsson <bengt.g.jonsson@stericsson.com>

The Vsafe regulator should not be handled by kernel, it should be
setup before the kernel starts. This patch removes the setting of
Vsmsp3Regu.

Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/board-mop500-regulators.c |    6 ------
 drivers/regulator/ab8500.c                    |    6 ------
 include/linux/regulator/ab8500.h              |    1 -
 3 files changed, 13 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index f9f3fc3..7c36734 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -265,12 +265,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 3f5db96..a9841133 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -744,12 +744,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 74955db..d158dcf 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -81,7 +81,6 @@  enum ab8500_regulator_reg {
 	AB8500_REGUCTRL1VAMIC,
 	AB8500_VSMPS1REGU,
 	AB8500_VSMPS2REGU,
-	AB8500_VSMPS3REGU, /* NOTE! PRCMU register */
 	AB8500_VPLLVANAREGU,
 	AB8500_VREFDDR,
 	AB8500_EXTSUPPLYREGU,