Merge branch 'ib-gpiod-flags' into devel

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 385df5241e5d..19fce24ea4a0 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -3316,6 +3316,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
+ * @index:      index of the GPIO to obtain in the consumer
  * @dflags:     GPIO initialization flags
  *
  * This function can be used for drivers that get their configuration
@@ -3331,7 +3332,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_index);
  * 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, int index,
                                          enum gpiod_flags dflags,
                                          const char *label)
 {
@@ -3347,8 +3348,8 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
         if (is_of_node(fwnode)) {
                 enum of_gpio_flags flags;
 
-                desc = of_get_named_gpiod_flags(to_of_node(fwnode), propname, 0,
-                                                &flags);
+                desc = of_get_named_gpiod_flags(to_of_node(fwnode), propname,
+                                                index, &flags);
                 if (!IS_ERR(desc)) {
                         active_low = flags & OF_GPIO_ACTIVE_LOW;
                         single_ended = flags & OF_GPIO_SINGLE_ENDED;
@@ -3356,7 +3357,7 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
         } else if (is_acpi_node(fwnode)) {
                 struct acpi_gpio_info info;
 
-                desc = acpi_node_get_gpiod(fwnode, propname, 0, &info);
+                desc = acpi_node_get_gpiod(fwnode, propname, index, &info);
                 if (!IS_ERR(desc))
                         active_low = info.polarity == GPIO_ACTIVE_LOW;
         }