From patchwork Fri Jul 17 09:32:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 497047 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C42A4140774 for ; Fri, 17 Jul 2015 19:33:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756674AbbGQJdf (ORCPT ); Fri, 17 Jul 2015 05:33:35 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:36616 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757284AbbGQJdd (ORCPT ); Fri, 17 Jul 2015 05:33:33 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZG09c-0006H7-Sn; Fri, 17 Jul 2015 09:33:56 +0200 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.86_RC4) (envelope-from ) id 1ZG21K-0007WI-TQ; Fri, 17 Jul 2015 11:33:30 +0200 From: Markus Pargmann To: Linus Walleij Cc: Alexandre Courbot , linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Markus Pargmann Subject: [PATCH 6/9] gpiolib-of: Reuse 'line-name' from DT as gpio descriptor name Date: Fri, 17 Jul 2015 11:32:47 +0200 Message-Id: <1437125570-28623-7-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437125570-28623-1-git-send-email-mpa@pengutronix.de> References: <1437125570-28623-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-gpio@vger.kernel.org Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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; + } + + if (of_property_read_bool(np, "gpio-hog")) { + if (!dflags) { + pr_warn("GPIO line %d (%s): no hogging state specified, bailing out\n", + desc_to_gpio(desc), np->name); + continue; + } + + if (gpiod_hog(desc, name, lflags, dflags)) + continue; + } } }