Merge tag 'x86-core-2023-07-09' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / leds / leds-gpio.c

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index ce4e799..7bfe40a 100644 (file)
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -13,6 +13,7 @@
 #include <linux/leds.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/slab.h>
@@ -77,6 +78,7 @@ static int create_gpio_led(const struct gpio_led *template,
        struct fwnode_handle *fwnode, gpio_blink_set_t blink_set)
 {
        struct led_init_data init_data = {};
+       struct pinctrl *pinctrl;
        int ret, state;
 
        led_dat->cdev.default_trigger = template->default_trigger;
@@ -119,6 +121,22 @@ static int create_gpio_led(const struct gpio_led *template,
                                                     &init_data);
        }
 
+       if (ret)
+               return ret;
+
+       pinctrl = devm_pinctrl_get_select_default(led_dat->cdev.dev);
+       if (IS_ERR(pinctrl)) {
+               ret = PTR_ERR(pinctrl);
+               if (ret != -ENODEV) {
+                       dev_warn(led_dat->cdev.dev,
+                                "Failed to select %pOF pinctrl: %d\n",
+                                to_of_node(fwnode), ret);
+               } else {
+                       /* pinctrl-%d not present, not an error */
+                       ret = 0;
+               }
+       }
+
        return ret;
 }