diff options
| author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-10-23 14:32:52 +0800 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-10-24 15:48:03 +0800 |
| commit | bd9382fcd65b732eb744562abaf7ee7f4cc7e279 (patch) | |
| tree | 3646ae1c8c55ffe1c14b5b6b8332a8c9c787e8d0 | |
| parent | 4595ebc4cd168a4f33b4968213f12dfb3fefe8cc (diff) | |
gpio: pl061: hook request if gpio-ranges avaiabletracking-hilt-lsk-gpio-1023
gpio-ranges property could binds gpio to pinctrl. But there may be some
gpios without pinctrl operation. So check whether gpio-ranges property
exists in device node first.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
| -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; |