From nobody Thu Feb 12 17:27:54 2026 Received: from fgw21-7.mail.saunalahti.fi (fgw21-7.mail.saunalahti.fi [62.142.5.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2746178CE4 for ; Tue, 11 Jun 2024 09:31:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=62.142.5.82 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718098300; cv=none; b=QxZLFPZ9w0aQi8BhcYVbVcf1bKsPgjpmMTbsxZiPFop54uyxdV4ZWISV8fWPg/lgYGrEduasiQnJInpLJlzw/m6xiEDJsNEqagJ3wHSA6Y5HFcE2oPXgg638G+8267eUfNtQYgfKB2Wr8yBnwjl4JBo/Uc5m+kPvRDso1wFK58U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718098300; c=relaxed/simple; bh=mMVL8afWJZyH/lJQmN80I97zDhgRVPAlN2XpKsFbxs0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JeOfTtycC2m93fZk0ZfM5C45WvWxU82cd33pY4QRl4ZqRori/UMgJyZ680DrUhfou3JrCwD143WrjrqMyI242ofU2ez+RPs6oLR0DZ9ZazjIB7wZbM67rzFEpYZymuV3e+qK8HX96WX+dOlXSxmHc4ghp2170eBkZozo3DFd5Ik= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com; spf=fail smtp.mailfrom=gmail.com; arc=none smtp.client-ip=62.142.5.82 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=gmail.com Received: from localhost (88-113-25-87.elisa-laajakaista.fi [88.113.25.87]) by fgw21.mail.saunalahti.fi (Halon) with ESMTP id 657d3fe3-27d5-11ef-ab0f-005056bdd08f; Tue, 11 Jun 2024 12:31:35 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Jacky Huang , Linus Walleij , Tomer Maimon , linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org Cc: Shan-Chun Hung , Avi Fishman , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Subject: [PATCH v1 4/4] pinctrl: nuvoton: Reduce use of OF-specific APIs Date: Tue, 11 Jun 2024 12:30:25 +0300 Message-ID: <20240611093127.90210-5-andy.shevchenko@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240611093127.90210-1-andy.shevchenko@gmail.com> References: <20240611093127.90210-1-andy.shevchenko@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some drivers are using device property APIs along with OF-specific ones. At the same time few of the latter can be converted to device property calls. Reduce use of OF-specific APIs in order to bring a bit more consiste= ncy into the drivers. Signed-off-by: Andy Shevchenko --- drivers/pinctrl/nuvoton/pinctrl-ma35.c | 35 +++++++++++------------ drivers/pinctrl/nuvoton/pinctrl-ma35d1.c | 1 - drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 16 ++--------- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2 +- 4 files changed, 21 insertions(+), 33 deletions(-) diff --git a/drivers/pinctrl/nuvoton/pinctrl-ma35.c b/drivers/pinctrl/nuvot= on/pinctrl-ma35.c index 7c2b0039d1e4..2bb0bdbc881a 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-ma35.c +++ b/drivers/pinctrl/nuvoton/pinctrl-ma35.c @@ -519,7 +519,6 @@ static int ma35_gpiolib_register(struct platform_device= *pdev, struct ma35_pinct bank->irqtype =3D 0; bank->irqinten =3D 0; bank->chip.label =3D bank->name; - bank->chip.of_gpio_n_cells =3D 2; bank->chip.parent =3D &pdev->dev; bank->chip.request =3D ma35_gpio_core_to_request; bank->chip.direction_input =3D ma35_gpio_core_direction_in; @@ -976,9 +975,10 @@ static const struct pinconf_ops ma35_pinconf_ops =3D { .is_generic =3D true, }; =20 -static int ma35_pinctrl_parse_groups(struct device_node *np, struct group_= desc *grp, +static int ma35_pinctrl_parse_groups(struct fwnode_handle *fwnode, struct = group_desc *grp, struct ma35_pinctrl *npctl, u32 index) { + struct device_node *np =3D to_of_node(fwnode); struct ma35_pin_setting *pin; unsigned long *configs; unsigned int nconfigs; @@ -990,7 +990,7 @@ static int ma35_pinctrl_parse_groups(struct device_node= *np, struct group_desc * if (ret) return ret; =20 - count =3D of_property_count_elems_of_size(np, "nuvoton,pins", sizeof(u32)= ); + count =3D fwnode_property_count_u32(fwnode, "nuvoton,pins"); if (!count || count % 3) return -EINVAL; =20 @@ -1000,7 +1000,7 @@ static int ma35_pinctrl_parse_groups(struct device_no= de *np, struct group_desc * =20 grp->grp.name =3D np->name; =20 - ret =3D of_property_read_u32_array(np, "nuvoton,pins", elems, count); + ret =3D fwnode_property_read_u32_array(fwnode, "nuvoton,pins", elems, cou= nt); if (ret) return -EINVAL; grp->grp.npins =3D count / 3; @@ -1027,10 +1027,11 @@ static int ma35_pinctrl_parse_groups(struct device_= node *np, struct group_desc * return 0; } =20 -static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma3= 5_pinctrl *npctl, +static int ma35_pinctrl_parse_functions(struct fwnode_handle *fwnode, stru= ct ma35_pinctrl *npctl, u32 index) { - struct device_node *child; + struct device_node *np =3D to_of_node(fwnode); + struct fwnode_handle *child; struct pinfunction *func; struct group_desc *grp; static u32 grp_index; @@ -1050,12 +1051,14 @@ static int ma35_pinctrl_parse_functions(struct devi= ce_node *np, struct ma35_pinc if (!groups) return -ENOMEM; =20 - for_each_child_of_node(np, child) { - groups[i] =3D child->name; + fwnode_for_each_child_node(fwnode, child) { + struct device_node *node =3D to_of_node(child); + + groups[i] =3D node->name; grp =3D &npctl->groups[grp_index++]; ret =3D ma35_pinctrl_parse_groups(child, grp, npctl, i++); if (ret) { - of_node_put(child); + fwnode_handle_put(child); return ret; } } @@ -1066,13 +1069,12 @@ static int ma35_pinctrl_parse_functions(struct devi= ce_node *np, struct ma35_pinc =20 static int ma35_pinctrl_probe_dt(struct platform_device *pdev, struct ma35= _pinctrl *npctl) { + struct device *dev =3D &pdev->dev; struct fwnode_handle *child; u32 idx =3D 0; int ret; =20 - device_for_each_child_node(&pdev->dev, child) { - if (fwnode_property_present(child, "gpio-controller")) - continue; + for_each_gpiochip_node(dev, child) { npctl->nfunctions++; npctl->ngroups +=3D of_get_child_count(to_of_node(child)); } @@ -1090,11 +1092,8 @@ static int ma35_pinctrl_probe_dt(struct platform_dev= ice *pdev, struct ma35_pinct if (!npctl->groups) return -ENOMEM; =20 - device_for_each_child_node(&pdev->dev, child) { - if (fwnode_property_present(child, "gpio-controller")) - continue; - - ret =3D ma35_pinctrl_parse_functions(to_of_node(child), npctl, idx++); + for_each_gpiochip_node(dev, child) { + ret =3D ma35_pinctrl_parse_functions(child, npctl, idx++); if (ret) { fwnode_handle_put(child); dev_err(&pdev->dev, "failed to parse function\n"); @@ -1139,7 +1138,7 @@ int ma35_pinctrl_probe(struct platform_device *pdev, = const struct ma35_pinctrl_s npctl->info =3D info; npctl->dev =3D &pdev->dev; =20 - npctl->regmap =3D syscon_regmap_lookup_by_phandle(pdev->dev.of_node, "nuv= oton,sys"); + npctl->regmap =3D syscon_regmap_lookup_by_phandle(dev_of_node(dev), "nuvo= ton,sys"); if (IS_ERR(npctl->regmap)) return dev_err_probe(&pdev->dev, PTR_ERR(npctl->regmap), "No syscfg phandle specified\n"); diff --git a/drivers/pinctrl/nuvoton/pinctrl-ma35d1.c b/drivers/pinctrl/nuv= oton/pinctrl-ma35d1.c index 8bb9a5a35954..eafa06ca0879 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-ma35d1.c +++ b/drivers/pinctrl/nuvoton/pinctrl-ma35d1.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include =20 diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nu= voton/pinctrl-npcm7xx.c index c6b11a198c76..d9245aa55d65 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c @@ -7,10 +7,8 @@ #include #include #include +#include #include -#include -#include -#include #include #include #include @@ -1839,15 +1837,7 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *p= ctrl) int id =3D 0; =20 for_each_gpiochip_node(dev, child) { - struct device_node *np =3D to_of_node(child); - - ret =3D of_address_to_resource(np, 0, &res); - if (ret < 0) { - dev_err(dev, "Resource fail for GPIO bank %u\n", id); - return ret; - } - - pctrl->gpio_bank[id].base =3D ioremap(res.start, resource_size(&res)); + pctrl->gpio_bank[id].base =3D fwnode_iomap(child, 0); if (!pctrl->gpio_bank[id].base) return -EINVAL; =20 @@ -1869,7 +1859,7 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pc= trl) return ret; } =20 - ret =3D irq_of_parse_and_map(np, 0); + ret =3D fwnode_irq_get(child, 0); if (!ret) { dev_err(dev, "No IRQ for GPIO bank %u\n", id); return -EINVAL; diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nu= voton/pinctrl-npcm8xx.c index 7c37d2cda9f1..4410077615df 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c @@ -2421,7 +2421,7 @@ static int npcm8xx_pinctrl_probe(struct platform_devi= ce *pdev) platform_set_drvdata(pdev, pctrl); =20 pctrl->gcr_regmap =3D - syscon_regmap_lookup_by_phandle(dev->of_node, "nuvoton,sysgcr"); + syscon_regmap_lookup_by_phandle(dev_of_node(dev), "nuvoton,sysgcr"); if (IS_ERR(pctrl->gcr_regmap)) return dev_err_probe(dev, PTR_ERR(pctrl->gcr_regmap), "Failed to find nuvoton,sysgcr property\n"); --=20 2.45.2