summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-pl061.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-03-15 20:52:07 +0800
committerLinus Walleij <linus.walleij@linaro.org>2013-03-27 22:51:18 +0100
commit22ce4464fad1c0a90ed5c9a745a1fceabf69283d (patch)
tree05625a4bfb41ca8aa8cd08c593c7fd7f541ab855 /drivers/gpio/gpio-pl061.c
parent8b0ef2580f7ffdd0018332ab9c085729afa59f75 (diff)
downloadlinux-stable-22ce4464fad1c0a90ed5c9a745a1fceabf69283d.tar.gz
linux-stable-22ce4464fad1c0a90ed5c9a745a1fceabf69283d.tar.bz2
linux-stable-22ce4464fad1c0a90ed5c9a745a1fceabf69283d.zip
gpio: pl061: Add pl061_gpio_free()
commit 39b70ee051 "gpio: pl061: bind pinctrl by gpio request" adds pl061_gpio_request() to request pinctrl. Thus we need to add corresponding pl061_gpio_free() to free the pin. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-pl061.c')
-rw-r--r--drivers/gpio/gpio-pl061.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 06ed257c5d31..d7008dfdd6f0 100644
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -72,6 +72,13 @@ static int pl061_gpio_request(struct gpio_chip *chip, unsigned offset)
return pinctrl_request_gpio(gpio);
}
+static void pl061_gpio_free(struct gpio_chip *chip, unsigned offset)
+{
+ int gpio = chip->base + offset;
+
+ pinctrl_free_gpio(gpio);
+}
+
static int pl061_direction_input(struct gpio_chip *gc, unsigned offset)
{
struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
@@ -287,6 +294,7 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
spin_lock_init(&chip->lock);
chip->gc.request = pl061_gpio_request;
+ chip->gc.free = pl061_gpio_free;
chip->gc.direction_input = pl061_direction_input;
chip->gc.direction_output = pl061_direction_output;
chip->gc.get = pl061_get_value;