leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

leds: lp55xx: Convert to use GPIO descriptors

Browse Source 
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>
This commit is contained in:
Linus Walleij 2020-06-27 00:40:11 +02:00 committed by Pavel Machek
parent e190f57df3
commit ac219bf3c9
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/leds/leds-lp55xx-common.c
View File

@ -17,8 +17,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/leds-lp55xx.h> #include <linux/platform_data/leds-lp55xx.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/gpio.h> #include <linux/gpio/consumer.h>
#include <linux/of_gpio.h>
#include "leds-lp55xx-common.h" #include "leds-lp55xx-common.h"
@ -395,18 +394,11 @@ int lp55xx_init_device(struct lp55xx_chip *chip)
if (!pdata || !cfg) if (!pdata || !cfg)
return -EINVAL; return -EINVAL;
if (gpio_is_valid(pdata->enable_gpio)) { if (pdata->enable_gpiod) {
ret = devm_gpio_request_one(dev, pdata->enable_gpio, gpiod_set_consumer_name(pdata->enable_gpiod, "LP55xx enable");
GPIOF_DIR_OUT, "lp5523_enable"); gpiod_set_value(pdata->enable_gpiod, 0);
if (ret < 0) {
dev_err(dev, "could not acquire enable gpio (err=%d)\n",
ret);
goto err;
}
gpio_set_value(pdata->enable_gpio, 0);
usleep_range(1000, 2000); /* Keep enable down at least 1ms */ 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. */ usleep_range(1000, 2000); /* 500us abs min. */
} }
@ -447,8 +439,8 @@ void lp55xx_deinit_device(struct lp55xx_chip *chip)
if (chip->clk) if (chip->clk)
clk_disable_unprepare(chip->clk); clk_disable_unprepare(chip->clk);
if (gpio_is_valid(pdata->enable_gpio)) if (pdata->enable_gpiod)
gpio_set_value(pdata->enable_gpio, 0); gpiod_set_value(pdata->enable_gpiod, 0);
} }
EXPORT_SYMBOL_GPL(lp55xx_deinit_device); 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_string(np, "label", &pdata->label);
of_property_read_u8(np, "clock-mode", &pdata->clock_mode); 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 */ /* LP8501 specific */
of_property_read_u8(np, "pwr-sel", (u8 *)&pdata->pwr_sel); of_property_read_u8(np, "pwr-sel", (u8 *)&pdata->pwr_sel);

6
include/linux/platform_data/leds-lp55xx.h
View File

@ -12,6 +12,8 @@
#ifndef _LEDS_LP55XX_H #ifndef _LEDS_LP55XX_H
#define _LEDS_LP55XX_H #define _LEDS_LP55XX_H
#include <linux/gpio/consumer.h>
/* Clock configuration */ /* Clock configuration */
#define LP55XX_CLOCK_AUTO 0 #define LP55XX_CLOCK_AUTO 0
#define LP55XX_CLOCK_INT 1 #define LP55XX_CLOCK_INT 1
@ -49,7 +51,7 @@ enum lp8501_pwr_sel {
* @clock_mode : Input clock mode. LP55XX_CLOCK_AUTO or _INT or _EXT * @clock_mode : Input clock mode. LP55XX_CLOCK_AUTO or _INT or _EXT
* @setup_resources : Platform specific function before enabling the chip * @setup_resources : Platform specific function before enabling the chip
* @release_resources : Platform specific function after disabling the chip * @release_resources : Platform specific function after disabling the chip
* @enable : EN pin control by platform side * @enable_gpiod : enable GPIO descriptor
* @patterns : Predefined pattern data for RGB channels * @patterns : Predefined pattern data for RGB channels
* @num_patterns : Number of patterns * @num_patterns : Number of patterns
* @update_config : Value of CONFIG register * @update_config : Value of CONFIG register
@ -65,7 +67,7 @@ struct lp55xx_platform_data {
u8 clock_mode; u8 clock_mode;
/* optional enable GPIO */ /* optional enable GPIO */
int enable_gpio; struct gpio_desc *enable_gpiod;
/* Predefined pattern data */ /* Predefined pattern data */
struct lp55xx_predef_pattern *patterns; struct lp55xx_predef_pattern *patterns;