|
@@ -202,6 +202,7 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
|
|
|
drvdata->startup_delay = config->startup_delay;
|
|
|
|
|
|
if (gpio_is_valid(config->gpio)) {
|
|
|
+ int gpio_flag;
|
|
|
drvdata->enable_high = config->enable_high;
|
|
|
|
|
|
/* FIXME: Remove below print warning
|
|
@@ -219,27 +220,25 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
|
|
|
dev_warn(&pdev->dev,
|
|
|
"using GPIO 0 for regulator enable control\n");
|
|
|
|
|
|
- ret = gpio_request(config->gpio, config->supply_name);
|
|
|
- if (ret) {
|
|
|
- dev_err(&pdev->dev,
|
|
|
- "Could not obtain regulator enable GPIO %d: %d\n",
|
|
|
- config->gpio, ret);
|
|
|
- goto err_name;
|
|
|
- }
|
|
|
-
|
|
|
- /* set output direction without changing state
|
|
|
+ /*
|
|
|
+ * set output direction without changing state
|
|
|
* to prevent glitch
|
|
|
*/
|
|
|
drvdata->is_enabled = config->enabled_at_boot;
|
|
|
ret = drvdata->is_enabled ?
|
|
|
config->enable_high : !config->enable_high;
|
|
|
+ gpio_flag = ret ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
|
|
|
+
|
|
|
+ if (config->gpio_is_open_drain)
|
|
|
+ gpio_flag |= GPIOF_OPEN_DRAIN;
|
|
|
|
|
|
- ret = gpio_direction_output(config->gpio, ret);
|
|
|
+ ret = gpio_request_one(config->gpio, gpio_flag,
|
|
|
+ config->supply_name);
|
|
|
if (ret) {
|
|
|
dev_err(&pdev->dev,
|
|
|
- "Could not configure regulator enable GPIO %d direction: %d\n",
|
|
|
+ "Could not obtain regulator enable GPIO %d: %d\n",
|
|
|
config->gpio, ret);
|
|
|
- goto err_gpio;
|
|
|
+ goto err_name;
|
|
|
}
|
|
|
|
|
|
drvdata->desc.ops = &fixed_voltage_gpio_ops;
|