diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-02-14 10:45:22 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-02-14 10:45:22 +0300 |
| commit | 92de6bc3a82df2e745c46155e8334659f871ea6f (patch) | |
| tree | 7f447f88a325a52517317124cc0f8d4d391eebb7 /drivers/gpio/gpiolib-of.c | |
| parent | 5340f23df8fe27a270af3fa1a93cd07293d23dd9 (diff) | |
| parent | 15add06841a3b0b4734a72847a73c71fd09ebe52 (diff) | |
| download | linux-92de6bc3a82df2e745c46155e8334659f871ea6f.tar.xz | |
Merge branch 'ib-pca953x-config' into devel
Diffstat (limited to 'drivers/gpio/gpiolib-of.c')
| -rw-r--r-- | drivers/gpio/gpiolib-of.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index a6e1891217e2..9a8b78477f79 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -345,6 +345,11 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, if (of_flags & OF_GPIO_TRANSITORY) *flags |= GPIO_TRANSITORY; + if (of_flags & OF_GPIO_PULL_UP) + *flags |= GPIO_PULL_UP; + if (of_flags & OF_GPIO_PULL_DOWN) + *flags |= GPIO_PULL_DOWN; + return desc; } |