Merge branch 'ib-gpiod-flags' into devel

1 files changed, 23 insertions, 12 deletions

diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index 80bad7ebde04..ea9b01d40017 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -135,14 +135,14 @@ int desc_to_gpio(const struct gpio_desc *desc);
 struct fwnode_handle;
 
 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);
-struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,
-                                            const char *con_id,
-                                            struct fwnode_handle *child,
-                                            enum gpiod_flags flags,
-                                            const char *label);
+struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
+                                                const char *con_id, int index,
+                                                struct fwnode_handle *child,
+                                                enum gpiod_flags flags,
+                                                const char *label);
 #else /* CONFIG_GPIOLIB */
 
 static inline int gpiod_count(struct device *dev, const char *con_id)
@@ -417,7 +417,7 @@ struct fwnode_handle;
 
 static inline
 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)
 {
@@ -425,17 +425,28 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
 }
 
 static inline
-struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,
-                                            const char *con_id,
-                                            struct fwnode_handle *child,
-                                            enum gpiod_flags flags,
-                                            const char *label)
+struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
+                                                const char *con_id, int index,
+                                                struct fwnode_handle *child,
+                                                enum gpiod_flags flags,
+                                                const char *label)
 {
         return ERR_PTR(-ENOSYS);
 }
 
 #endif /* CONFIG_GPIOLIB */
 
+static inline
+struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,
+                                                   const char *con_id,
+                                                   struct fwnode_handle *child,
+                                                   enum gpiod_flags flags,
+                                                   const char *label)
+{
+        return devm_fwnode_get_index_gpiod_from_child(dev, con_id, 0, child,
+                                                      flags, label);
+}
+
 #if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)
 
 int gpiod_export(struct gpio_desc *desc, bool direction_may_change);