Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 537b94da authored by Boris Brezillon's avatar Boris Brezillon Committed by Linus Walleij
Browse files

gpio: Add the devm_fwnode_get_index_gpiod_from_child() helper 



devm_fwnode_get_gpiod_from_child() currently allows GPIO users to
request a GPIO that is defined in a child fwnode instead of directly in
the device fwnode.
Extend this API by adding the devm_fwnode_get_index_gpiod_from_child()
helper which does the same except you can also specify an index in case
the 'xx-gpios' property describe several GPIOs.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 4b094797

drivers/gpio/devres.c

+11 −9
Original line number Diff line number Diff line
@@ -123,10 +123,11 @@ struct gpio_desc *__must_check devm_gpiod_get_index(struct device *dev, 
EXPORT_SYMBOL(devm_gpiod_get_index);



/**

 * devm_fwnode_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

 *
@@ -136,8 +137,8 @@ EXPORT_SYMBOL(devm_gpiod_get_index); 
 * On successfull request the GPIO pin is configured in accordance with

 * provided @flags.

 */

struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,

						   const char *con_id,

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)
@@ -161,7 +162,8 @@ struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev, 
			snprintf(prop_name, sizeof(prop_name), "%s",

							       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 +177,7 @@ struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev, 


	return desc;

}

EXPORT_SYMBOL(devm_fwnode_get_gpiod_from_child);

EXPORT_SYMBOL(devm_fwnode_get_index_gpiod_from_child);



/**

 * devm_gpiod_get_index_optional - Resource-managed gpiod_get_index_optional()

drivers/gpio/gpiolib.c

+5 −4
Original line number Diff line number Diff line
@@ -3309,6 +3309,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
@@ -3324,7 +3325,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)

{
@@ -3340,8 +3341,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;
@@ -3349,7 +3350,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;

	}

include/linux/gpio/consumer.h

+21 −10
Original line number Diff line number Diff line
@@ -135,11 +135,11 @@ 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_fwnode_get_gpiod_from_child(struct device *dev,

						   const char *con_id,

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);
@@ -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,8 +425,8 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, 
}



static inline

struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev,

						   const char *con_id,

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)
@@ -436,6 +436,17 @@ struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev, 


#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);