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

Commit e4df1ebd authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'ib-gpiod-flags' into devel

parents e8e1a5b5 537b94da

drivers/gpio/devres.c

+11 −8
Original line number Diff line number Diff line
@@ -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,8 +139,8 @@ 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 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 +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()

drivers/gpio/gpiolib.c

+5 −4
Original line number Diff line number Diff line
@@ -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;

	}

drivers/input/keyboard/gpio_keys.c

+4 −2
Original line number Diff line number Diff line
@@ -481,8 +481,10 @@ static int gpio_keys_setup_key(struct platform_device *pdev, 
	spin_lock_init(&bdata->lock);



	if (child) {

		bdata->gpiod = devm_get_gpiod_from_child(dev, NULL, child,

							 GPIOD_IN, desc);

		bdata->gpiod = devm_fwnode_get_gpiod_from_child(dev, NULL,

								child,

								GPIOD_IN,

								desc);

		if (IS_ERR(bdata->gpiod)) {

			error = PTR_ERR(bdata->gpiod);

			if (error == -ENOENT) {

drivers/input/keyboard/gpio_keys_polled.c

+4 −4
Original line number Diff line number Diff line
@@ -303,8 +303,8 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) 
				return -EINVAL;

			}



			bdata->gpiod = devm_get_gpiod_from_child(dev, NULL,

								 child,

			bdata->gpiod = devm_fwnode_get_gpiod_from_child(dev,

								NULL, child,

								GPIOD_IN,

								button->desc);

			if (IS_ERR(bdata->gpiod)) {

drivers/leds/leds-gpio.c

+3 −2
Original line number Diff line number Diff line
@@ -182,8 +182,9 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) 
			return ERR_PTR(-EINVAL);

		}



		led.gpiod = devm_get_gpiod_from_child(dev, NULL, child,

						      GPIOD_ASIS, led.name);

		led.gpiod = devm_fwnode_get_gpiod_from_child(dev, NULL, child,

							     GPIOD_ASIS,

							     led.name);

		if (IS_ERR(led.gpiod)) {

			fwnode_handle_put(child);

			return ERR_CAST(led.gpiod);