pinctrl: nuvoton: Reduce use of OF-specific APIs

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 consistency
into the drivers.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/20250318105932.2090926-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/nuvoton/pinctrl-ma35.c b/drivers/pinctrl/nuvoton/pinctrl-ma35.c
index da3c8d8e3eb3d61ec6f55d6bbd00933c06e75d51..06ae1fe8b8c5452a4c6ab0205de9504f60b42d14 100644 (file)
--- 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 = 0;
                bank->irqinten = 0;
                bank->chip.label = bank->name;
-               bank->chip.of_gpio_n_cells = 2;
                bank->chip.parent = &pdev->dev;
                bank->chip.request = ma35_gpio_core_to_request;
                bank->chip.direction_input = ma35_gpio_core_direction_in;
@@ -976,9 +975,10 @@ static const struct pinconf_ops ma35_pinconf_ops = {
        .is_generic = true,
 };
 
-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 = 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;
 
-       count = of_property_count_elems_of_size(np, "nuvoton,pins", sizeof(u32));
+       count = fwnode_property_count_u32(fwnode, "nuvoton,pins");
        if (!count || count % 3)
                return -EINVAL;
 
@@ -1000,7 +1000,7 @@ static int ma35_pinctrl_parse_groups(struct device_node *np, struct group_desc *
 
        grp->grp.name = np->name;
 
-       ret = of_property_read_u32_array(np, "nuvoton,pins", elems, count);
+       ret = fwnode_property_read_u32_array(fwnode, "nuvoton,pins", elems, count);
        if (ret)
                return -EINVAL;
        grp->grp.npins = count / 3;
@@ -1027,10 +1027,11 @@ static int ma35_pinctrl_parse_groups(struct device_node *np, struct group_desc *
        return 0;
 }
 
-static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pinctrl *npctl,
+static int ma35_pinctrl_parse_functions(struct fwnode_handle *fwnode, struct ma35_pinctrl *npctl,
                                        u32 index)
 {
-       struct device_node *child;
+       struct device_node *np = 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 device_node *np, struct ma35_pinc
        if (!groups)
                return -ENOMEM;
 
-       for_each_child_of_node(np, child) {
-               groups[i] = child->name;
+       fwnode_for_each_child_node(fwnode, child) {
+               struct device_node *node = to_of_node(child);
+
+               groups[i] = node->name;
                grp = &npctl->groups[grp_index++];
                ret = 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 device_node *np, struct ma35_pinc
 
 static int ma35_pinctrl_probe_dt(struct platform_device *pdev, struct ma35_pinctrl *npctl)
 {
+       struct device *dev = &pdev->dev;
        struct fwnode_handle *child;
        u32 idx = 0;
        int ret;
 
-       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 += of_get_child_count(to_of_node(child));
        }
@@ -1090,11 +1092,8 @@ static int ma35_pinctrl_probe_dt(struct platform_device *pdev, struct ma35_pinct
        if (!npctl->groups)
                return -ENOMEM;
 
-       device_for_each_child_node(&pdev->dev, child) {
-               if (fwnode_property_present(child, "gpio-controller"))
-                       continue;
-
-               ret = ma35_pinctrl_parse_functions(to_of_node(child), npctl, idx++);
+       for_each_gpiochip_node(dev, child) {
+               ret = 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 = info;
        npctl->dev = &pdev->dev;
 
-       npctl->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, "nuvoton,sys");
+       npctl->regmap = syscon_regmap_lookup_by_phandle(dev_of_node(dev), "nuvoton,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/nuvoton/pinctrl-ma35d1.c
index 8bb9a5a35954336d33b8d79323b8937c97fb155e..eafa06ca087910e76376dfcc52c5f720f45f5660 100644 (file)
--- a/drivers/pinctrl/nuvoton/pinctrl-ma35d1.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-ma35d1.c
@@ -9,7 +9,6 @@
 #include <linux/io.h>
 #include <linux/mod_devicetable.h>
 #include <linux/module.h>
-#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 

diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
index c6b11a198c76e56dc74e9618c85d0c269e85c198..dfd32feb34286b7a4d807e9033a11f507e277dce 100644 (file)
--- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
@@ -7,10 +7,8 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/mfd/syscon.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
@@ -1832,22 +1830,13 @@ static struct pinctrl_desc npcm7xx_pinctrl_desc = {
 static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
 {
        int ret = -ENXIO;
-       struct resource res;
        struct device *dev = pctrl->dev;
        struct fwnode_reference_args args;
        struct fwnode_handle *child;
        int id = 0;
 
        for_each_gpiochip_node(dev, child) {
-               struct device_node *np = to_of_node(child);
-
-               ret = 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 = ioremap(res.start, resource_size(&res));
+               pctrl->gpio_bank[id].base = fwnode_iomap(child, 0);
                if (!pctrl->gpio_bank[id].base)
                        return -EINVAL;
 
@@ -1869,7 +1858,7 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
                        return ret;
                }
 
-               ret = irq_of_parse_and_map(np, 0);
+               ret = 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/nuvoton/pinctrl-npcm8xx.c
index ef87cb929133a8b11fd1e73c9b7a0d27858dba24..934ceed4f57f59303b309a3b9321f71cdf4e69a9 100644 (file)
--- 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_device *pdev)
        platform_set_drvdata(pdev, pctrl);
 
        pctrl->gcr_regmap =
-               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");