mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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: Alexander Stein <[email protected]> Cc: Andy Shevchenko <[email protected]> Acked-by: Jacek Anaszewski <[email protected]> Acked-by: Bartlomiej Zolnierkiewicz <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
This commit is contained in:
parent
a264d10ff4
commit
b2987d7438
7 changed files with 33 additions and 20 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue