Skip to contentSkip to conversation

regulator: palmas: Use regulator_[list|map]_voltage_linear() for palmas_ops_smps10

PATCH Applied Axel Lin 2 participants 2 messages May 22, 2012 – May 23, 2012

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

Axel Lin

author
#0 lore raw

PATCH v2 1/1 regulator: palmas: Use regulator_[list|map]_voltage_linear() for palmas_ops_smps10

Signed-off-by Axel Lin <[email protected]>
Acked-by Graeme Gregory <[email protected]>

---
V2: trivial typo fix

 drivers/regulator/palmas-regulator.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
drivers/regulator/palmas-regulator.c +4 -7
index 9b7ca90..4fd8333 100644
@@ -400,19 +400,14 @@ static struct regulator_ops palmas_ops_smps = {
 	.map_voltage		= palmas_map_voltage_smps,
 };
 
-static int palmas_list_voltage_smps10(struct regulator_dev *dev,
-					unsigned selector)
-{
-	return 3750000 + (selector * 1250000);
-}
-
 static struct regulator_ops palmas_ops_smps10 = {
 	.is_enabled		= regulator_is_enabled_regmap,
 	.enable			= regulator_enable_regmap,
 	.disable		= regulator_disable_regmap,
 	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
 	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
-	.list_voltage		= palmas_list_voltage_smps10,
+	.list_voltage		= regulator_list_voltage_linear,
+	.map_voltage		= regulator_map_voltage_linear,
 };
 
 static int palmas_is_enabled_ldo(struct regulator_dev *dev)

@@ -675,6 +670,8 @@ static __devinit int palmas_probe(struct platform_device *pdev)
 			pmic->desc[id].vsel_mask = SMPS10_VSEL;
 			pmic->desc[id].enable_reg = PALMAS_SMPS10_STATUS;
 			pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
+			pmic->desc[id].min_uV = 3750000;
+			pmic->desc[id].uV_step = 1250000;
 		}
 
 		pmic->desc[id].type = REGULATOR_VOLTAGE;
Signature · 1 line
1.7.5.4