pinctrl: renesas: rza1: Switch to use for_each_gpiochip_node() helper

Switch the code to use for_each_gpiochip_node() helper.

While at it, in order to avoid additional churn in the future,
switch to fwnode APIs where it makes sense.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/drivers/pinctrl/renesas/pinctrl-rza1.c b/drivers/pinctrl/renesas/pinctrl-rza1.c
index acc00b1..529c0fc 100644 (file)
--- a/drivers/pinctrl/renesas/pinctrl-rza1.c
+++ b/drivers/pinctrl/renesas/pinctrl-rza1.c
@@ -24,6 +24,7 @@
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
+#include <linux/property.h>
 #include <linux/slab.h>
 
 #include "../core.h"
@@ -1161,22 +1162,22 @@ static const struct pinmux_ops rza1_pinmux_ops = {
  * defined by gpio device tree binding documentation.
  *
  * @rza1_pctl: RZ/A1 pin controller device
- * @np: of gpio-controller node
+ * @fwnode: gpio-controller firmware node
  * @chip: gpio chip to register to gpiolib
  * @range: pin range to register to pinctrl core
  */
 static int rza1_parse_gpiochip(struct rza1_pinctrl *rza1_pctl,
-                              struct device_node *np,
+                              struct fwnode_handle *fwnode,
                               struct gpio_chip *chip,
                               struct pinctrl_gpio_range *range)
 {
        const char *list_name = "gpio-ranges";
-       struct of_phandle_args of_args;
+       struct fwnode_reference_args args;
        unsigned int gpioport;
        u32 pinctrl_base;
        int ret;
 
-       ret = of_parse_phandle_with_fixed_args(np, list_name, 3, 0, &of_args);
+       ret = fwnode_property_get_reference_args(fwnode, list_name, NULL, 3, 0, &args);
        if (ret) {
                dev_err(rza1_pctl->dev, "Unable to parse %s list property\n",
                        list_name);
@@ -1187,7 +1188,7 @@ static int rza1_parse_gpiochip(struct rza1_pinctrl *rza1_pctl,
         * Find out on which port this gpio-chip maps to by inspecting the
         * second argument of the "gpio-ranges" property.
         */
-       pinctrl_base = of_args.args[1];
+       pinctrl_base = args.args[1];
        gpioport = RZA1_PIN_ID_TO_PORT(pinctrl_base);
        if (gpioport >= RZA1_NPORTS) {
                dev_err(rza1_pctl->dev,
@@ -1197,19 +1198,18 @@ static int rza1_parse_gpiochip(struct rza1_pinctrl *rza1_pctl,
 
        *chip           = rza1_gpiochip_template;
        chip->base      = -1;
-       chip->label     = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%pOFn",
-                                        np);
+       chip->ngpio     = args.args[2];
+       chip->label     = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%pfwP", fwnode);
        if (!chip->label)
                return -ENOMEM;
 
-       chip->ngpio     = of_args.args[2];
-       chip->of_node   = np;
+       chip->fwnode    = fwnode;
        chip->parent    = rza1_pctl->dev;
 
        range->id       = gpioport;
        range->name     = chip->label;
        range->pin_base = range->base = pinctrl_base;
-       range->npins    = of_args.args[2];
+       range->npins    = args.args[2];
        range->gc       = chip;
 
        ret = devm_gpiochip_add_data(rza1_pctl->dev, chip,
@@ -1232,10 +1232,9 @@ static int rza1_parse_gpiochip(struct rza1_pinctrl *rza1_pctl,
  */
 static int rza1_gpio_register(struct rza1_pinctrl *rza1_pctl)
 {
-       struct device_node *np = rza1_pctl->dev->of_node;
        struct pinctrl_gpio_range *gpio_ranges;
        struct gpio_chip *gpio_chips;
-       struct device_node *child;
+       struct fwnode_handle *child;
        unsigned int ngpiochips;
        unsigned int i;
        int ret;
@@ -1254,14 +1253,11 @@ static int rza1_gpio_register(struct rza1_pinctrl *rza1_pctl)
                return -ENOMEM;
 
        i = 0;
-       for_each_child_of_node(np, child) {
-               if (!of_property_read_bool(child, "gpio-controller"))
-                       continue;
-
+       for_each_gpiochip_node(rza1_pctl->dev, child) {
                ret = rza1_parse_gpiochip(rza1_pctl, child, &gpio_chips[i],
                                          &gpio_ranges[i]);
                if (ret) {
-                       of_node_put(child);
+                       fwnode_handle_put(child);
                        return ret;
                }