kernel: use fwnode for GPIO export driver

Upstream prefers more generic fwnode/device handlers as opposed to OF
ones.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/24176
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/generic/hack-6.12/800-GPIO-add-named-gpio-exports.patch b/target/linux/generic/hack-6.12/800-GPIO-add-named-gpio-exports.patch
index 367ad69664c01c5cf68e87b52146ae9efdeb5789..63d993b4d341d99014114de20595154e5e5591e2 100644 (file)
--- a/target/linux/generic/hack-6.12/800-GPIO-add-named-gpio-exports.patch
+++ b/target/linux/generic/hack-6.12/800-GPIO-add-named-gpio-exports.patch
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  #include "gpiolib.h"
  #include "gpiolib-of.h"
-@@ -1205,3 +1207,72 @@ void of_gpiochip_remove(struct gpio_chip
+@@ -1205,3 +1207,61 @@ void of_gpiochip_remove(struct gpio_chip
  
        of_node_put(np);
  }
@@ -29,50 +29,39 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +
 +static int of_gpio_export_probe(struct platform_device *pdev)
 +{
-+      struct device_node *np = pdev->dev.of_node;
++      struct device *dev = &pdev->dev;
 +      u32 val;
 +      int nb = 0;
 +
-+      for_each_child_of_node_scoped(np, cnp) {
++      device_for_each_child_node_scoped(dev, child) {
++              struct gpio_desc *desc;
 +              const char *name = NULL;
-+              int gpio;
 +              bool dmc;
-+              int max_gpio = 1;
-+              int i;
-+
-+              of_property_read_string(cnp, "gpio-export,name", &name);
-+
-+              if (!name)
-+                      max_gpio = of_gpio_named_count(cnp, "gpios");
-+
-+              for (i = 0; i < max_gpio; i++) {
-+                      struct gpio_desc *desc;
-+                      unsigned flags = 0;
-+                      enum of_gpio_flags of_flags;
-+
-+                      desc = of_get_named_gpiod_flags(cnp, "gpios", i, &of_flags);
++              enum gpiod_flags dflags;
++              int i = 0;
++
++              if (!fwnode_property_read_u32(child, "gpio-export,output", &val))
++                      dflags = val ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW;
++              else
++                      dflags = GPIOD_IN;
++
++              fwnode_property_read_string(child, "gpio-export,name", &name);
++              while (true) {
++                      desc = devm_fwnode_gpiod_get_index(dev, child, NULL, i, dflags,
++                                      name ? name : fwnode_get_name(child));
++                      if (PTR_ERR(desc) == -ENOENT)
++                              break;
 +                      if (IS_ERR(desc))
 +                              return PTR_ERR(desc);
-+                      gpio = desc_to_gpio(desc);
-+
-+                      if (of_flags & OF_GPIO_ACTIVE_LOW)
-+                              flags |= GPIOF_ACTIVE_LOW;
-+
-+                      if (!of_property_read_u32(cnp, "gpio-export,output", &val))
-+                              flags |= val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
-+                      else
-+                              flags |= GPIOF_IN;
-+
-+                      if (devm_gpio_request_one(&pdev->dev, gpio, flags, name ? name : of_node_full_name(np)))
-+                              continue;
 +
-+                      dmc = of_property_read_bool(cnp, "gpio-export,direction_may_change");
-+                      gpio_export_with_name(gpio_to_desc(gpio), dmc, name);
++                      dmc = fwnode_property_present(child, "gpio-export,direction_may_change");
++                      gpio_export_with_name(desc, dmc, name);
 +                      nb++;
++                      i++;
 +              }
 +      }
 +
-+      dev_info(&pdev->dev, "%d gpio(s) exported\n", nb);
++      dev_info(dev, "%d gpio(s) exported\n", nb);
 +
 +      return 0;
 +}

diff --git a/target/linux/generic/hack-6.18/800-GPIO-add-named-gpio-exports.patch b/target/linux/generic/hack-6.18/800-GPIO-add-named-gpio-exports.patch
index a18015d0b92bfe7c49a026f5b64cb14c8a760ead..2420c968f0b4b2f839642f82ab41a1c1e8ba0651 100644 (file)
--- a/target/linux/generic/hack-6.18/800-GPIO-add-named-gpio-exports.patch
+++ b/target/linux/generic/hack-6.18/800-GPIO-add-named-gpio-exports.patch
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  #include "gpiolib.h"
  #include "gpiolib-of.h"
-@@ -1302,3 +1304,72 @@ bool of_gpiochip_instance_match(struct g
+@@ -1302,3 +1304,61 @@ bool of_gpiochip_instance_match(struct g
  
        return false;
  }
@@ -29,50 +29,39 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +
 +static int of_gpio_export_probe(struct platform_device *pdev)
 +{
-+      struct device_node *np = pdev->dev.of_node;
++      struct device *dev = &pdev->dev;
 +      u32 val;
 +      int nb = 0;
 +
-+      for_each_child_of_node_scoped(np, cnp) {
++      device_for_each_child_node_scoped(dev, child) {
++              struct gpio_desc *desc;
 +              const char *name = NULL;
-+              int gpio;
 +              bool dmc;
-+              int max_gpio = 1;
-+              int i;
-+
-+              of_property_read_string(cnp, "gpio-export,name", &name);
-+
-+              if (!name)
-+                      max_gpio = of_gpio_named_count(cnp, "gpios");
-+
-+              for (i = 0; i < max_gpio; i++) {
-+                      struct gpio_desc *desc;
-+                      unsigned flags = 0;
-+                      enum of_gpio_flags of_flags;
-+
-+                      desc = of_get_named_gpiod_flags(cnp, "gpios", i, &of_flags);
++              enum gpiod_flags dflags;
++              int i = 0;
++
++              if (!fwnode_property_read_u32(child, "gpio-export,output", &val))
++                      dflags = val ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW;
++              else
++                      dflags = GPIOD_IN;
++
++              fwnode_property_read_string(child, "gpio-export,name", &name);
++              while (true) {
++                      desc = devm_fwnode_gpiod_get_index(dev, child, NULL, i, dflags,
++                                      name ? name : fwnode_get_name(child));
++                      if (PTR_ERR(desc) == -ENOENT)
++                              break;
 +                      if (IS_ERR(desc))
 +                              return PTR_ERR(desc);
-+                      gpio = desc_to_gpio(desc);
-+
-+                      if (!of_property_read_u32(cnp, "gpio-export,output", &val))
-+                              flags |= val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
-+                      else
-+                              flags |= GPIOF_IN;
-+
-+                      if (devm_gpio_request_one(&pdev->dev, gpio, flags, name ? name : of_node_full_name(np)))
-+                              continue;
-+
-+                      if (of_flags & OF_GPIO_ACTIVE_LOW)
-+                              gpiod_toggle_active_low(gpio_to_desc(gpio));
 +
-+                      dmc = of_property_read_bool(cnp, "gpio-export,direction_may_change");
-+                      gpio_export_with_name(gpio_to_desc(gpio), dmc, name);
++                      dmc = fwnode_property_present(child, "gpio-export,direction_may_change");
++                      gpio_export_with_name(desc, dmc, name);
 +                      nb++;
++                      i++;
 +              }
 +      }
 +
-+      dev_info(&pdev->dev, "%d gpio(s) exported\n", nb);
++      dev_info(dev, "%d gpio(s) exported\n", nb);
 +
 +      return 0;
 +}