diff options
| author | Timur Tabi | 2017-07-27 20:19:23 +0200 |
|---|---|---|
| committer | Linus Walleij | 2017-08-14 15:01:12 +0200 |
| commit | 108d23e322a247d9f89ba2e2742520ead0944cc9 (patch) | |
| tree | b11bd287e24c911d7e1b048de232a02431c43259 /drivers/gpio | |
| parent | gpio: pca953x: remove incorrect le16_to_cpu calls (diff) | |
| download | kernel-qcow2-linux-108d23e322a247d9f89ba2e2742520ead0944cc9.tar.gz kernel-qcow2-linux-108d23e322a247d9f89ba2e2742520ead0944cc9.tar.xz kernel-qcow2-linux-108d23e322a247d9f89ba2e2742520ead0944cc9.zip | |
gpiolib: request the gpio before querying its direction
Before querying a GPIO to determine its direction, the GPIO should be
formally requested. This allows the GPIO driver to block access to
unavailable GPIOs, which makes it easier for some drivers to support
sparse GPIO maps.
Signed-off-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index cd003b74512f..bd90737dce77 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1201,6 +1201,14 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data) struct gpio_desc *desc = &gdev->descs[i]; desc->gdev = gdev; + + if (chip->request) { + status = chip->request(chip, i); + if (status < 0) + /* The GPIO is unavailable, so skip it */ + continue; + } + /* * REVISIT: most hardware initializes GPIOs as inputs * (often with pullups enabled) so power usage is @@ -1226,6 +1234,9 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data) */ set_bit(FLAG_IS_OUT, &desc->flags); } + + if (chip->free) + chip->free(chip, i); } #ifdef CONFIG_PINCTRL |