Skip to contentSkip to conversation

palmas: Simplify regulator_desc setting for SMPS10_[OUT1|OUT2]

PATCH In review Axel Lin 2 participants 2 messages Jun 29, 2013 – Jun 30, 2013

Subsystems (2)
OMAP2+ support Voltage and current regulator framework
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 palmas: Simplify regulator_desc setting for SMPS10_[OUT1|OUT2]

The regulator_desc setting for SMPS10-OUT1 and SMPS10-OUT2 are very similar, only enable_mask is different.
Make the switch case fall through to simplify the code.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/regulator/palmas-regulator.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)
drivers/regulator/palmas-regulator.c +4 -18
index 50ca8c0..de25d20 100644
@@ -879,23 +879,6 @@ static int palmas_regulators_probe(struct platform_device *pdev)
 
 		switch (id) {
 		case PALMAS_REG_SMPS10_OUT1:
-			pmic->desc[id].n_voltages = PALMAS_SMPS10_NUM_VOLTAGES;
-			pmic->desc[id].ops = &palmas_ops_smps10;
-			pmic->desc[id].vsel_reg =
-					PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
-							PALMAS_SMPS10_CTRL);
-			pmic->desc[id].vsel_mask = SMPS10_VSEL;
-			pmic->desc[id].enable_reg =
-					PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
-							PALMAS_SMPS10_CTRL);
-			pmic->desc[id].enable_mask = SMPS10_SWITCH_EN;
-			pmic->desc[id].bypass_reg =
-					PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
-							PALMAS_SMPS10_CTRL);
-			pmic->desc[id].bypass_mask = SMPS10_BYPASS_EN;
-			pmic->desc[id].min_uV = 3750000;
-			pmic->desc[id].uV_step = 1250000;
-			break;
 		case PALMAS_REG_SMPS10_OUT2:
 			pmic->desc[id].n_voltages = PALMAS_SMPS10_NUM_VOLTAGES;
 			pmic->desc[id].ops = &palmas_ops_smps10;

@@ -906,7 +889,10 @@ static int palmas_regulators_probe(struct platform_device *pdev)
 			pmic->desc[id].enable_reg =
 					PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
 							PALMAS_SMPS10_CTRL);
-			pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
+			if (id == PALMAS_REG_SMPS10_OUT1)
+				pmic->desc[id].enable_mask = SMPS10_SWITCH_EN;
+			else
+				pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
 			pmic->desc[id].bypass_reg =
 					PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
 							PALMAS_SMPS10_CTRL);
Signature · 1 line
1.8.1.2