| Message ID | 1382510171-5937-1-git-send-email-haojian.zhuang@linaro.org |
|---|---|
| State | Changes Requested |
| Headers | show |
On Wed, Oct 23, 2013 at 8:36 AM, Haojian Zhuang <haojian.zhuang@linaro.org> wrote: > 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> OK... > + /* 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; > + } This is quite hard for those not using pinctrl to understand, maybe someone wants to use the request/free callbacks for something else in the future. Can't you: - Add a variable bool uses_pinctrl to struct pl061_gpio - Use the bool check: if (of_property_read_bool(np, "gpio-ranges")) chip->uses_pinctrl = true; - Alter the code in pl061_gpio_request() to do like this: if (chip->uses_pinctrl) pinctrl_request_gpio() And the same for pl061_gpio_free(). Yours, Linus Walleij
diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c index cb5510b..44a0ba1 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;
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> --- drivers/gpio/gpio-pl061.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)