From mboxrd@z Thu Jan 1 00:00:00 1970 From: k00278426 Subject: Re: [PATCH] gpio: pl061: hook request if gpio-ranges avaiable Date: Thu, 9 Oct 2014 19:15:52 +0800 Message-ID: <54366E68.5050804@hisilicon.com> References: <1412847735-498-1-git-send-email-haojian.zhuang@linaro.org> <543665A4.6000404@hisilicon.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from szxga02-in.huawei.com ([119.145.14.65]:10735 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751064AbaJILQK (ORCPT ); Thu, 9 Oct 2014 07:16:10 -0400 In-Reply-To: Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: Haojian Zhuang Cc: "linux-arm-kernel@lists.infradead.org" , "linux-gpio@vger.kernel.org" , Linus Walleij hi jian In the afternoon,we submit a patch about gpio-ranges item,we slove this issue by setting the .request pointer which is null. before coming true the pl061_gpio_request function, we slove the issue.you can study it. Best Regards xinwei On 2014/10/9 18:56, Haojian Zhuang wrote: > Hi Xinwei, > > Do I miss anything? At here, .request pointer isn't null. It always > points to pl061_gpio_request(). > > Best Regards > Haojian > > On 9 October 2014 18:38, k00278426 wrote: >> On 2014/10/9 17:42, Haojian Zhuang 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 >> --- >> drivers/gpio/gpio-pl061.c | 21 +++++++++++++++------ >> 1 file changed, 15 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c >> index 84b49cf..d1813f0 100644 >> --- a/drivers/gpio/gpio-pl061.c >> +++ b/drivers/gpio/gpio-pl061.c >> @@ -52,28 +52,34 @@ struct pl061_gpio { >> >> void __iomem *base; >> struct gpio_chip gc; >> + int uses_pinctrl; >> >> #ifdef CONFIG_PM >> struct pl061_context_save_regs csave_regs; >> #endif >> }; >> >> -static int pl061_gpio_request(struct gpio_chip *chip, unsigned offset) >> +static int pl061_gpio_request(struct gpio_chip *gc, unsigned offset) >> { >> /* >> * Map back to global GPIO space and request muxing, the direction >> * parameter does not matter for this controller. >> */ >> - int gpio = chip->base + offset; >> + struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc); >> + int gpio = gc->base + offset; >> >> - return pinctrl_request_gpio(gpio); >> + if (chip->uses_pinctrl) >> + return pinctrl_request_gpio(gpio); >> + return 0; >> } >> >> In the request_gpio process,if the .request point is null,the return >> of request_gpio process will value 0. the request_gpio process will not >> enter the pintrcl system. >> so the request_gpio have deal with the "if" branch. >> >> >> -static void pl061_gpio_free(struct gpio_chip *chip, unsigned offset) >> +static void pl061_gpio_free(struct gpio_chip *gc, unsigned offset) >> { >> - int gpio = chip->base + offset; >> + struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc); >> + int gpio = gc->base + offset; >> >> - pinctrl_free_gpio(gpio); >> + if (chip->uses_pinctrl) >> + pinctrl_free_gpio(gpio); >> } >> >> static int pl061_direction_input(struct gpio_chip *gc, unsigned offset) >> @@ -264,6 +270,9 @@ static int pl061_probe(struct amba_device *adev, const >> struct amba_id *id) >> >> spin_lock_init(&chip->lock); >> >> + /* Hook the request()/free() for pinctrl operation */ >> + if (of_property_read_bool(dev->of_node, "gpio-ranges")) >> + chip->uses_pinctrl = true; >> chip->gc.request = pl061_gpio_request; >> chip->gc.free = pl061_gpio_free; >> chip->gc.direction_input = pl061_direction_input; >> >> > . > From mboxrd@z Thu Jan 1 00:00:00 1970 From: kong.kongxinwei@hisilicon.com (k00278426) Date: Thu, 9 Oct 2014 19:15:52 +0800 Subject: [PATCH] gpio: pl061: hook request if gpio-ranges avaiable In-Reply-To: References: <1412847735-498-1-git-send-email-haojian.zhuang@linaro.org> <543665A4.6000404@hisilicon.com> Message-ID: <54366E68.5050804@hisilicon.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org hi jian In the afternoon,we submit a patch about gpio-ranges item,we slove this issue by setting the .request pointer which is null. before coming true the pl061_gpio_request function, we slove the issue.you can study it. Best Regards xinwei On 2014/10/9 18:56, Haojian Zhuang wrote: > Hi Xinwei, > > Do I miss anything? At here, .request pointer isn't null. It always > points to pl061_gpio_request(). > > Best Regards > Haojian > > On 9 October 2014 18:38, k00278426 wrote: >> On 2014/10/9 17:42, Haojian Zhuang 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 >> --- >> drivers/gpio/gpio-pl061.c | 21 +++++++++++++++------ >> 1 file changed, 15 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c >> index 84b49cf..d1813f0 100644 >> --- a/drivers/gpio/gpio-pl061.c >> +++ b/drivers/gpio/gpio-pl061.c >> @@ -52,28 +52,34 @@ struct pl061_gpio { >> >> void __iomem *base; >> struct gpio_chip gc; >> + int uses_pinctrl; >> >> #ifdef CONFIG_PM >> struct pl061_context_save_regs csave_regs; >> #endif >> }; >> >> -static int pl061_gpio_request(struct gpio_chip *chip, unsigned offset) >> +static int pl061_gpio_request(struct gpio_chip *gc, unsigned offset) >> { >> /* >> * Map back to global GPIO space and request muxing, the direction >> * parameter does not matter for this controller. >> */ >> - int gpio = chip->base + offset; >> + struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc); >> + int gpio = gc->base + offset; >> >> - return pinctrl_request_gpio(gpio); >> + if (chip->uses_pinctrl) >> + return pinctrl_request_gpio(gpio); >> + return 0; >> } >> >> In the request_gpio process,if the .request point is null,the return >> of request_gpio process will value 0. the request_gpio process will not >> enter the pintrcl system. >> so the request_gpio have deal with the "if" branch. >> >> >> -static void pl061_gpio_free(struct gpio_chip *chip, unsigned offset) >> +static void pl061_gpio_free(struct gpio_chip *gc, unsigned offset) >> { >> - int gpio = chip->base + offset; >> + struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc); >> + int gpio = gc->base + offset; >> >> - pinctrl_free_gpio(gpio); >> + if (chip->uses_pinctrl) >> + pinctrl_free_gpio(gpio); >> } >> >> static int pl061_direction_input(struct gpio_chip *gc, unsigned offset) >> @@ -264,6 +270,9 @@ static int pl061_probe(struct amba_device *adev, const >> struct amba_id *id) >> >> spin_lock_init(&chip->lock); >> >> + /* Hook the request()/free() for pinctrl operation */ >> + if (of_property_read_bool(dev->of_node, "gpio-ranges")) >> + chip->uses_pinctrl = true; >> chip->gc.request = pl061_gpio_request; >> chip->gc.free = pl061_gpio_free; >> chip->gc.direction_input = pl061_direction_input; >> >> > . >