From 2fb87a8ecdc468463d3935e4d131597a7b1a5bf5 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 15 Mar 2013 20:52:07 +0800 Subject: [PATCH] --- yaml --- r: 362985 b: refs/heads/master c: 22ce4464fad1c0a90ed5c9a745a1fceabf69283d h: refs/heads/master i: 362983: ce5259d842ed1b6edb07dfaf0e7a496e978d61b7 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-pl061.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8b09bf819952..eae545efdbbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b0ef2580f7ffdd0018332ab9c085729afa59f75 +refs/heads/master: 22ce4464fad1c0a90ed5c9a745a1fceabf69283d diff --git a/trunk/drivers/gpio/gpio-pl061.c b/trunk/drivers/gpio/gpio-pl061.c index 06ed257c5d31..d7008dfdd6f0 100644 --- a/trunk/drivers/gpio/gpio-pl061.c +++ b/trunk/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;