Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9119ff6a authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: palmas: Use linear_min_sel and regulator_[map|list]_voltage_linear 



Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 33234e79

drivers/regulator/palmas-regulator.c

+5 −32
Original line number Original line Diff line number Diff line
@@ -436,44 +436,14 @@ static int palmas_is_enabled_ldo(struct regulator_dev *dev) 
	return !!(reg);

	return !!(reg);

}

}





static int palmas_list_voltage_ldo(struct regulator_dev *dev,

					unsigned selector)

{

	if (!selector)

		return 0;



	/* voltage is 0.85V + (selector * 0.05v) */

	return  850000 + (selector * 50000);

}



static int palmas_map_voltage_ldo(struct regulator_dev *rdev,

		int min_uV, int max_uV)

{

	int ret, voltage;



	if (min_uV == 0)

		return 0;



	if (min_uV < 900000)

		min_uV = 900000;

	ret = DIV_ROUND_UP(min_uV - 900000, 50000) + 1;



	/* Map back into a voltage to verify we're still in bounds */

	voltage = palmas_list_voltage_ldo(rdev, ret);

	if (voltage < min_uV || voltage > max_uV)

		return -EINVAL;



	return ret;

}



static struct regulator_ops palmas_ops_ldo = {

static struct regulator_ops palmas_ops_ldo = {

	.is_enabled		= palmas_is_enabled_ldo,

	.is_enabled		= palmas_is_enabled_ldo,

	.enable			= regulator_enable_regmap,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.disable		= regulator_disable_regmap,

	.get_voltage_sel	= regulator_get_voltage_sel_regmap,

	.get_voltage_sel	= regulator_get_voltage_sel_regmap,

	.set_voltage_sel	= regulator_set_voltage_sel_regmap,

	.set_voltage_sel	= regulator_set_voltage_sel_regmap,

	.list_voltage		= palmas_list_voltage_ldo,

	.list_voltage		= regulator_list_voltage_linear,

	.map_voltage		= palmas_map_voltage_ldo,

	.map_voltage		= regulator_map_voltage_linear,

};

};





/*

/*
@@ -821,6 +791,9 @@ static __devinit int palmas_probe(struct platform_device *pdev) 




		pmic->desc[id].type = REGULATOR_VOLTAGE;

		pmic->desc[id].type = REGULATOR_VOLTAGE;

		pmic->desc[id].owner = THIS_MODULE;

		pmic->desc[id].owner = THIS_MODULE;

		pmic->desc[id].min_uV = 900000;

		pmic->desc[id].uV_step = 50000;

		pmic->desc[id].linear_min_sel = 1;

		pmic->desc[id].vsel_reg = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,

		pmic->desc[id].vsel_reg = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,

						palmas_regs_info[id].vsel_addr);

						palmas_regs_info[id].vsel_addr);

		pmic->desc[id].vsel_mask = PALMAS_LDO1_VOLTAGE_VSEL_MASK;

		pmic->desc[id].vsel_mask = PALMAS_LDO1_VOLTAGE_VSEL_MASK;