From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johan Hovold Subject: Re: [PATCH 6/9] gpiolib-of: Reuse 'line-name' from DT as gpio descriptor name Date: Tue, 28 Jul 2015 11:31:05 +0200 Message-ID: <20150728093105.GL28535@localhost> References: <1437125570-28623-1-git-send-email-mpa@pengutronix.de> <1437125570-28623-7-git-send-email-mpa@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-la0-f46.google.com ([209.85.215.46]:34228 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750844AbbG1JbH (ORCPT ); Tue, 28 Jul 2015 05:31:07 -0400 Received: by lafd3 with SMTP id d3so54475396laf.1 for ; Tue, 28 Jul 2015 02:31:05 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1437125570-28623-7-git-send-email-mpa@pengutronix.de> Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: Markus Pargmann Cc: Linus Walleij , Alexandre Courbot , linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de On Fri, Jul 17, 2015 at 11:32:47AM +0200, Markus Pargmann wrote: > The DT describes gpios with subnodes. These subnodes can contain a > property 'line-name'. This information can be useful in other areas > where we want to identify a GPIO by its name. > > This patch stores the line-name in the gpio descriptor. > > Signed-off-by: Markus Pargmann > --- > drivers/gpio/gpiolib-of.c | 29 ++++++++++++++++++++--------- > 1 file changed, 20 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c > index 64950591a764..cefc665a558c 100644 > --- a/drivers/gpio/gpiolib-of.c > +++ b/drivers/gpio/gpiolib-of.c > @@ -184,11 +184,6 @@ static struct gpio_desc *of_parse_gpio(struct device_node *np, > *dflags |= GPIOD_OUT_LOW; > else if (of_property_read_bool(np, "output-high")) > *dflags |= GPIOD_OUT_HIGH; > - else { > - pr_warn("GPIO line %d (%s): no hogging state specified, bailing out\n", > - desc_to_gpio(gg_data.out_gpio), np->name); > - return ERR_PTR(-EINVAL); > - } > > if (name && of_property_read_string(np, "line-name", name)) > *name = np->name; > @@ -214,15 +209,31 @@ static void of_gpiochip_scan_gpios(struct gpio_chip *chip) > > for_each_child_of_node(chip->of_node, np) { > const char *name = NULL; > - if (!of_property_read_bool(np, "gpio-hog")) > - continue; > + struct gpio_desc *name_desc; > > desc = of_parse_gpio(np, &name, &lflags, &dflags); > if (IS_ERR(desc)) > continue; > > - if (gpiod_hog(desc, name, lflags, dflags)) > - continue; > + if (name) { > + name_desc = gpio_name_to_desc(name); > + if (name_desc) > + pr_err("GPIO name collision for '%s' detected at GPIO line %d (%s)\n", > + name, desc_to_gpio(desc), np->name); > + else > + desc->name = name; This will introduce a regression. As I mentioned in a comment on an earlier patch, of_get_gpio_hog falls back to using the node name and those need not be unique. Johan From mboxrd@z Thu Jan 1 00:00:00 1970 From: johan@kernel.org (Johan Hovold) Date: Tue, 28 Jul 2015 11:31:05 +0200 Subject: [PATCH 6/9] gpiolib-of: Reuse 'line-name' from DT as gpio descriptor name In-Reply-To: <1437125570-28623-7-git-send-email-mpa@pengutronix.de> References: <1437125570-28623-1-git-send-email-mpa@pengutronix.de> <1437125570-28623-7-git-send-email-mpa@pengutronix.de> Message-ID: <20150728093105.GL28535@localhost> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Jul 17, 2015 at 11:32:47AM +0200, Markus Pargmann wrote: > The DT describes gpios with subnodes. These subnodes can contain a > property 'line-name'. This information can be useful in other areas > where we want to identify a GPIO by its name. > > This patch stores the line-name in the gpio descriptor. > > Signed-off-by: Markus Pargmann > --- > drivers/gpio/gpiolib-of.c | 29 ++++++++++++++++++++--------- > 1 file changed, 20 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c > index 64950591a764..cefc665a558c 100644 > --- a/drivers/gpio/gpiolib-of.c > +++ b/drivers/gpio/gpiolib-of.c > @@ -184,11 +184,6 @@ static struct gpio_desc *of_parse_gpio(struct device_node *np, > *dflags |= GPIOD_OUT_LOW; > else if (of_property_read_bool(np, "output-high")) > *dflags |= GPIOD_OUT_HIGH; > - else { > - pr_warn("GPIO line %d (%s): no hogging state specified, bailing out\n", > - desc_to_gpio(gg_data.out_gpio), np->name); > - return ERR_PTR(-EINVAL); > - } > > if (name && of_property_read_string(np, "line-name", name)) > *name = np->name; > @@ -214,15 +209,31 @@ static void of_gpiochip_scan_gpios(struct gpio_chip *chip) > > for_each_child_of_node(chip->of_node, np) { > const char *name = NULL; > - if (!of_property_read_bool(np, "gpio-hog")) > - continue; > + struct gpio_desc *name_desc; > > desc = of_parse_gpio(np, &name, &lflags, &dflags); > if (IS_ERR(desc)) > continue; > > - if (gpiod_hog(desc, name, lflags, dflags)) > - continue; > + if (name) { > + name_desc = gpio_name_to_desc(name); > + if (name_desc) > + pr_err("GPIO name collision for '%s' detected at GPIO line %d (%s)\n", > + name, desc_to_gpio(desc), np->name); > + else > + desc->name = name; This will introduce a regression. As I mentioned in a comment on an earlier patch, of_get_gpio_hog falls back to using the node name and those need not be unique. Johan