diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2013-10-24 15:51:19 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-10-24 15:51:19 +0800 |
| commit | 810dbb7818965bea218cef9914fdcf5aa42ee268 (patch) | |
| tree | 3bbf0f255de316e4c27efee4758aa3a435d44708 | |
| parent | 34f0cf01d312c42bc023aa74332c6c06932858f2 (diff) | |
| parent | bd9382fcd65b732eb744562abaf7ee7f4cc7e279 (diff) | |
Merge commit 'tracking-hilt-lsk-gpio-1023' into integration-hilt-lsk-androidintegration-hilt-lsk-android-1024
* commit 'tracking-hilt-lsk-gpio-1023':
gpio: pl061: hook request if gpio-ranges avaiable
| -rw-r--r-- | drivers/gpio/gpio-pl061.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c index cdb42a8b7133..7f7aab8fa50d 100644 --- a/drivers/gpio/gpio-pl061.c +++ b/drivers/gpio/gpio-pl061.c @@ -306,8 +306,11 @@ 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; + /* Hook the request()/free() for pinctrl operation */ + if (of_get_property(dev->of_node, "gpio-ranges", NULL)) { + 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; |