Commit 3d0f267f authored by Mark Brown's avatar Mark Brown

regulator: fixed: Set enable enable_time in regulator_desc

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 79511ed3
...@@ -36,7 +36,6 @@ struct fixed_voltage_data { ...@@ -36,7 +36,6 @@ struct fixed_voltage_data {
struct regulator_dev *dev; struct regulator_dev *dev;
int microvolts; int microvolts;
int gpio; int gpio;
unsigned startup_delay;
bool enable_high; bool enable_high;
bool is_enabled; bool is_enabled;
}; };
...@@ -136,13 +135,6 @@ static int fixed_voltage_disable(struct regulator_dev *dev) ...@@ -136,13 +135,6 @@ static int fixed_voltage_disable(struct regulator_dev *dev)
return 0; return 0;
} }
static int fixed_voltage_enable_time(struct regulator_dev *dev)
{
struct fixed_voltage_data *data = rdev_get_drvdata(dev);
return data->startup_delay;
}
static int fixed_voltage_get_voltage(struct regulator_dev *dev) static int fixed_voltage_get_voltage(struct regulator_dev *dev)
{ {
struct fixed_voltage_data *data = rdev_get_drvdata(dev); struct fixed_voltage_data *data = rdev_get_drvdata(dev);
...@@ -168,7 +160,6 @@ static struct regulator_ops fixed_voltage_gpio_ops = { ...@@ -168,7 +160,6 @@ static struct regulator_ops fixed_voltage_gpio_ops = {
.is_enabled = fixed_voltage_is_enabled, .is_enabled = fixed_voltage_is_enabled,
.enable = fixed_voltage_enable, .enable = fixed_voltage_enable,
.disable = fixed_voltage_disable, .disable = fixed_voltage_disable,
.enable_time = fixed_voltage_enable_time,
.get_voltage = fixed_voltage_get_voltage, .get_voltage = fixed_voltage_get_voltage,
.list_voltage = fixed_voltage_list_voltage, .list_voltage = fixed_voltage_list_voltage,
}; };
...@@ -213,12 +204,13 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev) ...@@ -213,12 +204,13 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
drvdata->desc.type = REGULATOR_VOLTAGE; drvdata->desc.type = REGULATOR_VOLTAGE;
drvdata->desc.owner = THIS_MODULE; drvdata->desc.owner = THIS_MODULE;
drvdata->desc.enable_time = config->startup_delay;
if (config->microvolts) if (config->microvolts)
drvdata->desc.n_voltages = 1; drvdata->desc.n_voltages = 1;
drvdata->microvolts = config->microvolts; drvdata->microvolts = config->microvolts;
drvdata->gpio = config->gpio; drvdata->gpio = config->gpio;
drvdata->startup_delay = config->startup_delay;
if (gpio_is_valid(config->gpio)) { if (gpio_is_valid(config->gpio)) {
int gpio_flag; int gpio_flag;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment