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

Commit 94f48ab3 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: tps65910: Set enable enable_time in regulator_desc 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a9905b1d

drivers/regulator/tps65910-regulator.c

+1 −11
Original line number Original line Diff line number Diff line
@@ -412,13 +412,6 @@ static int tps65911_get_ctrl_register(int id) 
	}

	}

}

}





static int tps65910_enable_time(struct regulator_dev *dev)

{

	struct tps65910_reg *pmic = rdev_get_drvdata(dev);

	int id = rdev_get_id(dev);

	return pmic->info[id]->enable_time_us;

}



static int tps65910_set_mode(struct regulator_dev *dev, unsigned int mode)

static int tps65910_set_mode(struct regulator_dev *dev, unsigned int mode)

{

{

	struct tps65910_reg *pmic = rdev_get_drvdata(dev);

	struct tps65910_reg *pmic = rdev_get_drvdata(dev);
@@ -762,7 +755,6 @@ static struct regulator_ops tps65910_ops_dcdc = { 
	.is_enabled		= regulator_is_enabled_regmap,

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.disable		= regulator_disable_regmap,

	.enable_time		= tps65910_enable_time,

	.set_mode		= tps65910_set_mode,

	.set_mode		= tps65910_set_mode,

	.get_mode		= tps65910_get_mode,

	.get_mode		= tps65910_get_mode,

	.get_voltage_sel	= tps65910_get_voltage_dcdc_sel,

	.get_voltage_sel	= tps65910_get_voltage_dcdc_sel,
@@ -775,7 +767,6 @@ static struct regulator_ops tps65910_ops_vdd3 = { 
	.is_enabled		= regulator_is_enabled_regmap,

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.disable		= regulator_disable_regmap,

	.enable_time		= tps65910_enable_time,

	.set_mode		= tps65910_set_mode,

	.set_mode		= tps65910_set_mode,

	.get_mode		= tps65910_get_mode,

	.get_mode		= tps65910_get_mode,

	.get_voltage		= tps65910_get_voltage_vdd3,

	.get_voltage		= tps65910_get_voltage_vdd3,
@@ -786,7 +777,6 @@ static struct regulator_ops tps65910_ops = { 
	.is_enabled		= regulator_is_enabled_regmap,

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.disable		= regulator_disable_regmap,

	.enable_time		= tps65910_enable_time,

	.set_mode		= tps65910_set_mode,

	.set_mode		= tps65910_set_mode,

	.get_mode		= tps65910_get_mode,

	.get_mode		= tps65910_get_mode,

	.get_voltage_sel	= tps65910_get_voltage_sel,

	.get_voltage_sel	= tps65910_get_voltage_sel,
@@ -798,7 +788,6 @@ static struct regulator_ops tps65911_ops = { 
	.is_enabled		= regulator_is_enabled_regmap,

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.disable		= regulator_disable_regmap,

	.enable_time		= tps65910_enable_time,

	.set_mode		= tps65910_set_mode,

	.set_mode		= tps65910_set_mode,

	.get_mode		= tps65910_get_mode,

	.get_mode		= tps65910_get_mode,

	.get_voltage_sel	= tps65911_get_voltage_sel,

	.get_voltage_sel	= tps65911_get_voltage_sel,
@@ -1139,6 +1128,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev) 
		pmic->desc[i].name = info->name;

		pmic->desc[i].name = info->name;

		pmic->desc[i].id = i;

		pmic->desc[i].id = i;

		pmic->desc[i].n_voltages = info->n_voltages;

		pmic->desc[i].n_voltages = info->n_voltages;

		pmic->desc[i].enable_time = info->enable_time_us;





		if (i == TPS65910_REG_VDD1 || i == TPS65910_REG_VDD2) {

		if (i == TPS65910_REG_VDD1 || i == TPS65910_REG_VDD2) {

			pmic->desc[i].ops = &tps65910_ops_dcdc;

			pmic->desc[i].ops = &tps65910_ops_dcdc;