From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 14 Jun 2023 12:09:14 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q9NRD-006UJ9-CD for lore@lore.pengutronix.de; Wed, 14 Jun 2023 12:09:14 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q9NRA-00065d-Ku for lore@pengutronix.de; Wed, 14 Jun 2023 12:09:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1aIlZaw5B213R9zyVsJ3x/q7T8DwwYldzYHBXt4A2Gs=; b=k+bjAHE1SwoNS8eTyVRYB+ZLVm XOAJBnHFDMWCy1PZBkp5x0QInZYNdfx8Ge8CgzGYxeBaA8lvAq4sDls9nV54ZnNBvAdYnF+zVl1OW KA8xYMfhQh9cERBV2IauG0Igu9/Knf8GGVHsIfUPXap/s3RBjzNPwqEA17WM7WhYJyW5biSHUUMtB YiyEW/d2gy0sVYQZhDnkGuMmnvIKCRMa99SYeGo+xRizyYWhAg2M/UgQJarKWfOsbIR4HgrJymSix 7RCFfWSZHSSW1ChgtXj7MlqJPurxlY/kgO0doMtgapq+CAD4VjtK/aqHuIFwATmOIz7u5yUpcf61D e/hQCeJw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q9NQB-00BAYL-2l; Wed, 14 Jun 2023 10:08:11 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q9NQ0-00BAQq-2s for barebox@lists.infradead.org; Wed, 14 Jun 2023 10:08:05 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q9NPt-0005cX-Nn; Wed, 14 Jun 2023 12:07:53 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1q9NPt-007Kbm-3t; Wed, 14 Jun 2023 12:07:53 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q9NPr-00E9ug-MI; Wed, 14 Jun 2023 12:07:51 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: mfe@pengutronix.de, Jules Maselbas , Ahmad Fatoum Date: Wed, 14 Jun 2023 12:07:43 +0200 Message-Id: <20230614100747.3368109-7-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230614100747.3368109-1-a.fatoum@pengutronix.de> References: <20230614100747.3368109-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230614_030800_987297_9FFDEBED X-CRM114-Status: GOOD ( 21.41 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 06/10] gpiolib: refactor gpio-line-names parsing X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) From: Marco Felsch Move the gpio-line-names parsing out of of_gpiochip_scan_hogs() since this has nothing to do with gpio-hogs. The new function is very similar with the kernel function devprop_gpiochip_set_names(). Signed-off-by: Marco Felsch Reviewed-by: Ahmad Fatoum Signed-off-by: Ahmad Fatoum --- v1 -> v2: - no change --- drivers/gpio/gpiolib.c | 102 ++++++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 37 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 275fb7324331..97d1a6d6687f 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -515,47 +515,11 @@ static int of_hog_gpio(struct device_node *np, struct gpio_chip *chip, static int of_gpiochip_scan_hogs(struct gpio_chip *chip) { struct device_node *np; - int ret, i, count; + int ret, i; if (!IS_ENABLED(CONFIG_OFDEVICE) || !chip->dev->of_node) return 0; - count = of_property_count_strings(chip->dev->of_node, - "gpio-line-names"); - - if (count > 0) { - const char **names = xzalloc(count * sizeof(char *)); - - ret = of_property_read_string_array(chip->dev->of_node, - "gpio-line-names", names, - count); - if (ret < 0) { - kfree(names); - return ret; - } - - /* - * Since property 'gpio-line-names' cannot contains gaps, we - * have to be sure we only assign those pins that really exists - * since chip->ngpio can be less. - */ - if (count > chip->ngpio) - count = chip->ngpio; - - for (i = 0; i < count; i++) { - /* - * Allow overriding "fixed" names provided by the GPIO - * provider. The "fixed" names are more often than not - * generic and less informative than the names given in - * device properties. - */ - if (names[i] && names[i][0]) - gpio_desc[chip->base + i].name = names[i]; - } - - free(names); - } - for_each_available_child_of_node(chip->dev->of_node, np) { if (!of_property_read_bool(np, "gpio-hog")) continue; @@ -575,6 +539,65 @@ static int of_gpiochip_scan_hogs(struct gpio_chip *chip) return 0; } +/* + * of_gpiochip_set_names - Set GPIO line names using OF properties + * @chip: GPIO chip whose lines should be named, if possible + * + * Looks for device property "gpio-line-names" and if it exists assigns + * GPIO line names for the chip. The memory allocated for the assigned + * names belong to the underlying firmware node and should not be released + * by the caller. + */ +static int of_gpiochip_set_names(struct gpio_chip *chip) +{ + struct device *dev = chip->dev; + struct device_node *np; + const char **names; + int ret, i, count; + + np = dev_of_node(dev); + if (!np) + return 0; + + count = of_property_count_strings(np, "gpio-line-names"); + if (count < 0) + return 0; + + names = kcalloc(count, sizeof(*names), GFP_KERNEL); + if (!names) + return -ENOMEM; + + ret = of_property_read_string_array(np, "gpio-line-names", + names, count); + if (ret < 0) { + kfree(names); + return ret; + } + + /* + * Since property 'gpio-line-names' cannot contains gaps, we + * have to be sure we only assign those pins that really exists + * since chip->ngpio can be less. + */ + if (count > chip->ngpio) + count = chip->ngpio; + + for (i = 0; i < count; i++) { + /* + * Allow overriding "fixed" names provided by the GPIO + * provider. The "fixed" names are more often than not + * generic and less informative than the names given in + * device properties. + */ + if (names[i] && names[i][0]) + gpio_desc[chip->base + i].name = names[i]; + } + + free(names); + + return 0; +} + #ifdef CONFIG_OFDEVICE static const char *gpio_suffixes[] = { "gpios", @@ -636,6 +659,7 @@ int dev_gpiod_get_index(struct device *dev, int gpiochip_add(struct gpio_chip *chip) { + int ret; int i; if (chip->base >= 0) { @@ -655,6 +679,10 @@ int gpiochip_add(struct gpio_chip *chip) for (i = chip->base; i < chip->base + chip->ngpio; i++) gpio_desc[i].chip = chip; + ret = of_gpiochip_set_names(chip); + if (ret) + return ret; + return of_gpiochip_scan_hogs(chip); } -- 2.39.2