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

Commit a264d10f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

gpiolib: Convert fwnode_get_named_gpiod() to configure GPIO 



Make fwnode_get_named_gpiod() consistent with the rest of
gpiod_get() like API, i.e. configure GPIO pin immediately after
request.

Besides obvious clean up it will help to configure pins based
on firmware provided resources.

Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7ce7d89f

drivers/gpio/devres.c

+7 −2
Original line number Diff line number Diff line
@@ -127,13 +127,18 @@ EXPORT_SYMBOL(devm_gpiod_get_index); 
 * @dev:	GPIO consumer

 * @con_id:	function within the GPIO consumer

 * @child:	firmware node (child of @dev)

 * @flags:	GPIO initialization flags

 *

 * GPIO descriptors returned from this function are automatically disposed on

 * driver detach.

 *

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

					    struct fwnode_handle *child,

					    enum gpiod_flags flags)

{

	static const char * const suffixes[] = { "gpios", "gpio" };

	char prop_name[32]; /* 32 is max size of property name */
@@ -154,7 +159,7 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev, 
			snprintf(prop_name, sizeof(prop_name), "%s",

							       suffixes[i]);



		desc = fwnode_get_named_gpiod(child, prop_name);

		desc = fwnode_get_named_gpiod(child, prop_name, flags);

		if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))

			break;

	}

drivers/gpio/gpiolib.c

+16 −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

 * @dflags:	GPIO initialization flags

 *

 * This function can be used for drivers that get their configuration

 * from firmware.
@@ -3317,12 +3318,17 @@ EXPORT_SYMBOL_GPL(gpiod_get_index); 
 * underlying firmware interface and then makes sure that the GPIO

 * descriptor is requested before it is returned to the caller.

 *

 * On successfull request the GPIO pin is configured in accordance with

 * provided @dflags.

 *

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

					 enum gpiod_flags dflags)

{

	struct gpio_desc *desc = ERR_PTR(-ENODEV);

	unsigned long lflags = 0;

	bool active_low = false;

	bool single_ended = false;

	int ret;
@@ -3355,13 +3361,19 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, 
		return ERR_PTR(ret);



	if (active_low)

		set_bit(FLAG_ACTIVE_LOW, &desc->flags);

		lflags |= GPIO_ACTIVE_LOW;



	if (single_ended) {

		if (active_low)

			set_bit(FLAG_OPEN_DRAIN, &desc->flags);

			lflags |= GPIO_OPEN_DRAIN;

		else

			set_bit(FLAG_OPEN_SOURCE, &desc->flags);

			lflags |= GPIO_OPEN_SOURCE;

	}



	ret = gpiod_configure_flags(desc, propname, lflags, dflags);

	if (ret < 0) {

		gpiod_put(desc);

		return ERR_PTR(ret);

	}



	return desc;

drivers/input/keyboard/gpio_keys.c

+1 −8
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ 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);

		bdata->gpiod = devm_get_gpiod_from_child(dev, NULL, child, GPIOD_IN);

		if (IS_ERR(bdata->gpiod)) {

			error = PTR_ERR(bdata->gpiod);

			if (error == -ENOENT) {
@@ -496,13 +496,6 @@ static int gpio_keys_setup_key(struct platform_device *pdev, 
						error);

				return error;

			}

		} else {

			error = gpiod_direction_input(bdata->gpiod);

			if (error) {

				dev_err(dev, "Failed to configure GPIO %d as input: %d\n",

					desc_to_gpio(bdata->gpiod), error);

				return error;

			}

		}

	} else if (gpio_is_valid(button->gpio)) {

		/*

drivers/input/keyboard/gpio_keys_polled.c

+2 −9
Original line number Diff line number Diff line
@@ -304,7 +304,8 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) 
			}



			bdata->gpiod = devm_get_gpiod_from_child(dev, NULL,

								 child);

								 child,

								 GPIOD_IN);

			if (IS_ERR(bdata->gpiod)) {

				error = PTR_ERR(bdata->gpiod);

				if (error != -EPROBE_DEFER)
@@ -314,14 +315,6 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) 
				fwnode_handle_put(child);

				return error;

			}



			error = gpiod_direction_input(bdata->gpiod);

			if (error) {

				dev_err(dev, "Failed to configure GPIO %d as input: %d\n",

					desc_to_gpio(bdata->gpiod), error);

				fwnode_handle_put(child);

				return error;

			}

		} else if (gpio_is_valid(button->gpio)) {

			/*

			 * Legacy GPIO number so request the GPIO here and

drivers/leds/leds-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) 
		const char *state = NULL;

		struct device_node *np = to_of_node(child);



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

		led.gpiod = devm_get_gpiod_from_child(dev, NULL, child, GPIOD_ASIS);

		if (IS_ERR(led.gpiod)) {

			fwnode_handle_put(child);

			return ERR_CAST(led.gpiod);