diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-12 11:10:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-12 11:10:25 +0100 |
| commit | 5949a7e9ab2db04edaeee7c368eb4c99131f4629 (patch) | |
| tree | 13e8da5dc42cc62b9721659c41045d2c27c31cc3 /drivers/regulator/fixed.c | |
| parent | 178e43aef2979525d7864daefd9499614e13800e (diff) | |
| parent | 411a2df5090ccb88f4c3726e4951ebed579fec11 (diff) | |
Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next
Conflicts:
drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)
Diffstat (limited to 'drivers/regulator/fixed.c')
| -rw-r--r-- | drivers/regulator/fixed.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index b47b005a8d2..f09fe7b20e8 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -25,7 +25,6 @@ #include <linux/regulator/driver.h> #include <linux/regulator/fixed.h> #include <linux/gpio.h> -#include <linux/delay.h> #include <linux/slab.h> #include <linux/of.h> #include <linux/of_gpio.h> @@ -91,6 +90,9 @@ of_get_fixed_voltage_config(struct device *dev) if (of_find_property(np, "enable-active-high", NULL)) config->enable_high = true; + if (of_find_property(np, "gpio-open-drain", NULL)) + config->gpio_is_open_drain = true; + return config; } |