Merge branch 'ib-gpiod-flags' into devel

1 files changed, 18 insertions, 5 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index c76fa4ffb59c..14ee088c80dd 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -3301,6 +3301,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_index);
  * fwnode_get_named_gpiod - obtain a GPIO from firmware node
  * @fwnode:     handle of the firmware node
  * @propname:   name of the firmware property representing the GPIO
+ * @dflags:     GPIO initialization flags
  *
  * This function can be used for drivers that get their configuration
  * from firmware.
@@ -3309,12 +3310,18 @@ EXPORT_SYMBOL_GPL(gpiod_get_index);
  * underlying firmware interface and then makes sure that the GPIO
  * descriptor is requested before it is returned to the caller.
  *
+ * On successfull request the GPIO pin is configured in accordance with
+ * provided @dflags.
+ *
  * In case of error an ERR_PTR() is returned.
  */
 struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
-                                         const char *propname)
+                                         const char *propname,
+                                         enum gpiod_flags dflags,
+                                         const char *label)
 {
         struct gpio_desc *desc = ERR_PTR(-ENODEV);
+        unsigned long lflags = 0;
         bool active_low = false;
         bool single_ended = false;
         int ret;
@@ -3342,18 +3349,24 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
         if (IS_ERR(desc))
                 return desc;
 
-        ret = gpiod_request(desc, NULL);
+        ret = gpiod_request(desc, label);
         if (ret)
                 return ERR_PTR(ret);
 
         if (active_low)
-                set_bit(FLAG_ACTIVE_LOW, &desc->flags);
+                lflags |= GPIO_ACTIVE_LOW;
 
         if (single_ended) {
                 if (active_low)
-                        set_bit(FLAG_OPEN_DRAIN, &desc->flags);
+                        lflags |= GPIO_OPEN_DRAIN;
                 else
-                        set_bit(FLAG_OPEN_SOURCE, &desc->flags);
+                        lflags |= GPIO_OPEN_SOURCE;
+        }
+
+        ret = gpiod_configure_flags(desc, propname, lflags, dflags);
+        if (ret < 0) {
+                gpiod_put(desc);
+                return ERR_PTR(ret);
         }
 
         return desc;