diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2018-02-12 14:17:00 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2018-02-16 17:05:45 +0000 |
| commit | 8d05560d1d011e5a842556efdbd70cc8a21499bb (patch) | |
| tree | 80b284ada6e65e4d7b8c1a9c32c4df687e6ddedb /drivers/regulator/da9055-regulator.c | |
| parent | regulator: core: Support passing an initialized GPIO enable descriptor (diff) | |
| download | linux-dev-8d05560d1d011e5a842556efdbd70cc8a21499bb.tar.xz linux-dev-8d05560d1d011e5a842556efdbd70cc8a21499bb.zip | |
regulator: da9055: Pass descriptor instead of GPIO number
When setting up a fixed regulator on the DA9055, pass a descriptor
instead of a global GPIO number. This facility is not used in the
kernel so we can easily just say that this should be a descriptor
if/when put to use.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/da9055-regulator.c')
| -rw-r--r-- | drivers/regulator/da9055-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c index d029c941a1e1..f40c3b8644ae 100644 --- a/drivers/regulator/da9055-regulator.c +++ b/drivers/regulator/da9055-regulator.c @@ -16,6 +16,7 @@ #include <linux/init.h> #include <linux/err.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/platform_device.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> @@ -455,8 +456,7 @@ static int da9055_gpio_init(struct da9055_regulator *regulator, char name[18]; int gpio_mux = pdata->gpio_ren[id]; - config->ena_gpio = pdata->ena_gpio[id]; - config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH; + config->ena_gpiod = pdata->ena_gpiods[id]; config->ena_gpio_invert = 1; /* |