diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2017-02-05 23:14:23 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-02-05 23:14:23 +0100 |
| commit | e4df1ebdfeb4c68523046667b2d8ef8ab20ae066 (patch) | |
| tree | 9a518146b64289e304412279b59466fad3799ed6 /drivers/gpio/devres.c | |
| parent | e8e1a5b5679b1ae1ff03a3883b011b84e7226171 (diff) | |
| parent | 537b94dafce29af6a3e923d216472cfc2f3659af (diff) | |
| download | op-kernel-dev-e4df1ebdfeb4c68523046667b2d8ef8ab20ae066.zip op-kernel-dev-e4df1ebdfeb4c68523046667b2d8ef8ab20ae066.tar.gz | |
Merge branch 'ib-gpiod-flags' into devel
Diffstat (limited to 'drivers/gpio/devres.c')
| -rw-r--r-- | drivers/gpio/devres.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/gpio/devres.c b/drivers/gpio/devres.c index d196be7..7031eea 100644 --- a/drivers/gpio/devres.c +++ b/drivers/gpio/devres.c @@ -125,9 +125,11 @@ struct gpio_desc *__must_check devm_gpiod_get_index(struct device *dev, EXPORT_SYMBOL(devm_gpiod_get_index); /** - * devm_get_gpiod_from_child - get a GPIO descriptor from a device's child node + * devm_fwnode_get_index_gpiod_from_child - get a GPIO descriptor from a + * device's child node * @dev: GPIO consumer * @con_id: function within the GPIO consumer + * @index: index of the GPIO to obtain in the consumer * @child: firmware node (child of @dev) * @flags: GPIO initialization flags * @@ -137,11 +139,11 @@ EXPORT_SYMBOL(devm_gpiod_get_index); * On successfull request the GPIO pin is configured in accordance with * provided @flags. */ -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) { char prop_name[32]; /* 32 is max size of property name */ struct gpio_desc **dr; @@ -161,7 +163,8 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev, snprintf(prop_name, sizeof(prop_name), "%s", gpio_suffixes[i]); - desc = fwnode_get_named_gpiod(child, prop_name, flags, label); + desc = fwnode_get_named_gpiod(child, prop_name, index, flags, + label); if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT)) break; } @@ -175,7 +178,7 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev, return desc; } -EXPORT_SYMBOL(devm_get_gpiod_from_child); +EXPORT_SYMBOL(devm_fwnode_get_index_gpiod_from_child); /** * devm_gpiod_get_index_optional - Resource-managed gpiod_get_index_optional() |
