summaryrefslogtreecommitdiff
path: root/drivers/regulator/ab8500.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-04-02 16:24:17 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-03 21:40:27 +0400
commit5fc9da6d372cc2a75beef7c65b7559fcd1a2716e (patch)
tree904e6822f780f9fa6e6323e64701f4b5a5527066 /drivers/regulator/ab8500.c
parenta4d68468ca6b24786ba0541bca27871f47e135b1 (diff)
downloadlinux-5fc9da6d372cc2a75beef7c65b7559fcd1a2716e.tar.xz
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: Lee Jones <lee.jones@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/ab8500.c')
-rw-r--r--drivers/regulator/ab8500.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 8a9cd45eac02..7892a516d074 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -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,