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

Commit b2987d74 authored by Alexander Stein's avatar Alexander Stein Committed by Linus Walleij
Browse files

gpio: Pass GPIO label down to gpiod_request 



Currently all users of fwnode_get_named_gpiod() have no way to
specify a label for the GPIO. So GPIOs listed in debugfs are shown
with label "?". With this change a proper label is used.

Also adjust all users so they can pass a label, properly retrieved
from device tree properties.

Signed-off-by: default avatarAlexander Stein <alexander.stein@systec-electronic.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a264d10f

drivers/gpio/devres.c

+3 −2
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ EXPORT_SYMBOL(devm_gpiod_get_index); 
struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,

					    const char *con_id,

					    struct fwnode_handle *child,

					    enum gpiod_flags flags)

					    enum gpiod_flags flags,

					    const char *label)

{

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

	char prop_name[32]; /* 32 is max size of property name */
@@ -159,7 +160,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, flags);

		desc = fwnode_get_named_gpiod(child, prop_name, flags, label);

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

			break;

	}

drivers/gpio/gpiolib.c

+3 −2
Original line number Diff line number Diff line
@@ -3325,7 +3325,8 @@ EXPORT_SYMBOL_GPL(gpiod_get_index); 
 */

struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,

					 const char *propname,

					 enum gpiod_flags dflags)

					 enum gpiod_flags dflags,

					 const char *label)

{

	struct gpio_desc *desc = ERR_PTR(-ENODEV);

	unsigned long lflags = 0;
@@ -3356,7 +3357,7 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, 
	if (IS_ERR(desc))

		return desc;



	ret = gpiod_request(desc, NULL);

	ret = gpiod_request(desc, label);

	if (ret)

		return ERR_PTR(ret);

drivers/input/keyboard/gpio_keys.c

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

		bdata->gpiod = devm_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

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


			bdata->gpiod = devm_get_gpiod_from_child(dev, NULL,

								 child,

								 GPIOD_IN);

								 GPIOD_IN,

								 button->desc);

			if (IS_ERR(bdata->gpiod)) {

				error = PTR_ERR(bdata->gpiod);

				if (error != -EPROBE_DEFER)

drivers/leds/leds-gpio.c

+7 −6
Original line number Diff line number Diff line
@@ -174,12 +174,6 @@ 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, GPIOD_ASIS);

		if (IS_ERR(led.gpiod)) {

			fwnode_handle_put(child);

			return ERR_CAST(led.gpiod);

		}



		ret = fwnode_property_read_string(child, "label", &led.name);

		if (ret && IS_ENABLED(CONFIG_OF) && np)

			led.name = np->name;
@@ -188,6 +182,13 @@ 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);

		if (IS_ERR(led.gpiod)) {

			fwnode_handle_put(child);

			return ERR_CAST(led.gpiod);

		}



		fwnode_property_read_string(child, "linux,default-trigger",

					    &led.default_trigger);