Merge branch 'ib-gpiod-flags' into devel

diff --cc drivers/gpio/devres.c
index 2c49a8bc9e3f7194aea72e091e563643ff1f16f0,89969e887e5d46624f8a2d7e4a65cae03be60989..d196be7ac352f0e9e4a4782a82c4a9c9cb185240
--- 1/drivers/gpio/devres.c
--- 2/drivers/gpio/devres.c
+++ b/drivers/gpio/devres.c
@@@ -135,8 -137,11 +139,10 @@@ EXPORT_SYMBOL(devm_gpiod_get_index)
   */
  struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,
                                            const char *con_id,
-                                           struct fwnode_handle *child)
+                                           struct fwnode_handle *child,
+                                           enum gpiod_flags flags,
+                                           const char *label)
  {
 -      static const char * const suffixes[] = { "gpios", "gpio" };
        char prop_name[32]; /* 32 is max size of property name */
        struct gpio_desc **dr;
        struct gpio_desc *desc;
@@@ -147,15 -152,15 +153,15 @@@
        if (!dr)
                return ERR_PTR(-ENOMEM);
  
 -      for (i = 0; i < ARRAY_SIZE(suffixes); i++) {
 +      for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
                if (con_id)
                        snprintf(prop_name, sizeof(prop_name), "%s-%s",
 -                                          con_id, suffixes[i]);
 +                                          con_id, gpio_suffixes[i]);
                else
                        snprintf(prop_name, sizeof(prop_name), "%s",
 -                                                             suffixes[i]);
 +                                          gpio_suffixes[i]);
  
-               desc = fwnode_get_named_gpiod(child, prop_name);
+               desc = fwnode_get_named_gpiod(child, prop_name, flags, label);
                if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
                        break;
        }

diff --cc drivers/gpio/gpiolib.c
Simple merge