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

Commit 5fc9da6d authored by Lee Jones's avatar Lee Jones Committed by Mark Brown
Browse files

regulator: ab8500: Remove the need for a 'delay' property 



The regulator framework now has provisions to read a regulator's
start-up time via the 'enable_time' attribute. So let's remove all
'enable_time'/'delay' duplication and just stick with 'enable_time'
from now on.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a4d68468

drivers/regulator/ab8500.c

+1 −4
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev, 
{

	struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);



	return info->delay;

	return info->desc.enable_time;

}



static struct regulator_ops ab8500_regulator_volt_mode_ops = {
@@ -1108,7 +1108,6 @@ static struct ab8500_regulator_info 
			.volt_table	= fixed_2000000_voltage,

			.enable_time	= 10000,

		},

		.delay			= 10000,

		.load_lp_uA		= 1000,

		.update_bank		= 0x03,

		.update_reg		= 0x80,
@@ -1374,7 +1373,6 @@ static struct ab8500_regulator_info 
			.volt_table	= fixed_2000000_voltage,

			.enable_time	= 10000,

		},

		.delay			= 10000,

		.load_lp_uA		= 1000,

		.update_bank		= 0x03,

		.update_reg		= 0x80,
@@ -1672,7 +1670,6 @@ static struct ab8500_regulator_info 
			.n_voltages	= 1,

			.enable_time	= 10000,

		},

		.delay			= 10000,

		.load_lp_uA		= 1000,

		.update_bank		= 0x03,

		.update_reg		= 0x80,