summaryrefslogtreecommitdiff
path: root/drivers/leds
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2020-06-27 00:40:11 +0200
committerPavel Machek <pavel@ucw.cz>2020-07-12 09:52:22 +0200
commitac219bf3c9bdf9200767e8c98a56ad42c75e5cd5 (patch)
tree8ce6b5b074223c73c36d92ebe73a8aa7947dac34 /drivers/leds
parente190f57df3c7e7713687905c14e72fbcbd81c5e4 (diff)
leds: lp55xx: Convert to use GPIO descriptors
The LP55xx driver is already using the of_gpio() functions to pick a global GPIO number for "enable" from the device tree and request the line. Simplify it by just using a GPIO descriptor. Make sure to keep the enable GPIO line optional, change the naming from "lp5523_enable" to "LP55xx enable" to reflect that this is used on all LP55xx LED drivers. Cc: Milo Kim <milo.kim@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Pavel Machek <pavel@ucw.cz>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds-lp55xx-common.c27
1 files changed, 11 insertions, 16 deletions
diff --git a/drivers/leds/leds-lp55xx-common.c b/drivers/leds/leds-lp55xx-common.c
index 44ced02b49f9..1354965ac866 100644
--- a/drivers/leds/leds-lp55xx-common.c
+++ b/drivers/leds/leds-lp55xx-common.c
@@ -17,8 +17,7 @@
#include <linux/module.h>
#include <linux/platform_data/leds-lp55xx.h>
#include <linux/slab.h>
-#include <linux/gpio.h>
-#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
#include "leds-lp55xx-common.h"
@@ -395,18 +394,11 @@ int lp55xx_init_device(struct lp55xx_chip *chip)
if (!pdata || !cfg)
return -EINVAL;
- if (gpio_is_valid(pdata->enable_gpio)) {
- ret = devm_gpio_request_one(dev, pdata->enable_gpio,
- GPIOF_DIR_OUT, "lp5523_enable");
- if (ret < 0) {
- dev_err(dev, "could not acquire enable gpio (err=%d)\n",
- ret);
- goto err;
- }
-
- gpio_set_value(pdata->enable_gpio, 0);
+ if (pdata->enable_gpiod) {
+ gpiod_set_consumer_name(pdata->enable_gpiod, "LP55xx enable");
+ gpiod_set_value(pdata->enable_gpiod, 0);
usleep_range(1000, 2000); /* Keep enable down at least 1ms */
- gpio_set_value(pdata->enable_gpio, 1);
+ gpiod_set_value(pdata->enable_gpiod, 1);
usleep_range(1000, 2000); /* 500us abs min. */
}
@@ -447,8 +439,8 @@ void lp55xx_deinit_device(struct lp55xx_chip *chip)
if (chip->clk)
clk_disable_unprepare(chip->clk);
- if (gpio_is_valid(pdata->enable_gpio))
- gpio_set_value(pdata->enable_gpio, 0);
+ if (pdata->enable_gpiod)
+ gpiod_set_value(pdata->enable_gpiod, 0);
}
EXPORT_SYMBOL_GPL(lp55xx_deinit_device);
@@ -579,7 +571,10 @@ struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev,
of_property_read_string(np, "label", &pdata->label);
of_property_read_u8(np, "clock-mode", &pdata->clock_mode);
- pdata->enable_gpio = of_get_named_gpio(np, "enable-gpio", 0);
+ pdata->enable_gpiod = devm_gpiod_get_optional(dev, "enable",
+ GPIOD_ASIS);
+ if (IS_ERR(pdata->enable_gpiod))
+ return ERR_CAST(pdata->enable_gpiod);
/* LP8501 specific */
of_property_read_u8(np, "pwr-sel", (u8 *)&pdata->pwr_sel);