github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

backlight: sky81452: Convert to GPIO descriptors

Browse Source 
The SKY81452 backlight driver just obtains a GPIO (named "gpios"
in the device tree) drives it high and leaves it high until the
driver is removed.

Switch to use GPIO descriptors for this, simple and
straight-forward.

Cc: Gyungoh Yoo <jack.yoo@skyworksinc.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Linus Walleij 2020-06-26 22:37:41 +02:00 committed by Lee Jones
parent a9b9b2af40
commit e1915eec54
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/video/backlight/sky81452-backlight.c
View File

@ -8,12 +8,11 @@
#include <linux/backlight.h> #include <linux/backlight.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h> #include <linux/gpio/consumer.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_gpio.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/platform_data/sky81452-backlight.h> #include <linux/platform_data/sky81452-backlight.h>
@ -182,7 +181,7 @@ static struct sky81452_bl_platform_data *sky81452_bl_parse_dt(
pdata->ignore_pwm = of_property_read_bool(np, "skyworks,ignore-pwm"); pdata->ignore_pwm = of_property_read_bool(np, "skyworks,ignore-pwm");
pdata->dpwm_mode = of_property_read_bool(np, "skyworks,dpwm-mode"); pdata->dpwm_mode = of_property_read_bool(np, "skyworks,dpwm-mode");
pdata->phase_shift = of_property_read_bool(np, "skyworks,phase-shift"); pdata->phase_shift = of_property_read_bool(np, "skyworks,phase-shift");
pdata->gpio_enable = of_get_gpio(np, 0); pdata->gpiod_enable = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);
ret = of_property_count_u32_elems(np, "led-sources"); ret = of_property_count_u32_elems(np, "led-sources");
if (ret < 0) { if (ret < 0) {
@ -264,15 +263,6 @@ static int sky81452_bl_probe(struct platform_device *pdev)
return PTR_ERR(pdata); return PTR_ERR(pdata);
} }
if (gpio_is_valid(pdata->gpio_enable)) {
ret = devm_gpio_request_one(dev, pdata->gpio_enable,
GPIOF_OUT_INIT_HIGH, "sky81452-en");
if (ret < 0) {
dev_err(dev, "failed to request GPIO. err=%d\n", ret);
return ret;
}
}
ret = sky81452_bl_init_device(regmap, pdata); ret = sky81452_bl_init_device(regmap, pdata);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to initialize. err=%d\n", ret); dev_err(dev, "failed to initialize. err=%d\n", ret);
@ -312,8 +302,8 @@ static int sky81452_bl_remove(struct platform_device *pdev)
bd->props.brightness = 0; bd->props.brightness = 0;
backlight_update_status(bd); backlight_update_status(bd);
if (gpio_is_valid(pdata->gpio_enable)) if (pdata->gpiod_enable)
gpio_set_value_cansleep(pdata->gpio_enable, 0); gpiod_set_value_cansleep(pdata->gpiod_enable, 0);
return 0; return 0;
} }

6
include/linux/platform_data/sky81452-backlight.h
View File

@ -9,11 +9,13 @@
#ifndef _SKY81452_BACKLIGHT_H #ifndef _SKY81452_BACKLIGHT_H
#define _SKY81452_BACKLIGHT_H #define _SKY81452_BACKLIGHT_H
#include <linux/gpio/consumer.h>
/** /**
* struct sky81452_platform_data * struct sky81452_platform_data
* @name: backlight driver name. * @name: backlight driver name.
If it is not defined, default name is lcd-backlight. If it is not defined, default name is lcd-backlight.
* @gpio_enable:GPIO number which control EN pin * @gpios_enable:GPIO descriptor which control EN pin
* @enable: Enable mask for current sink channel 1, 2, 3, 4, 5 and 6. * @enable: Enable mask for current sink channel 1, 2, 3, 4, 5 and 6.
* @ignore_pwm: true if DPWMI should be ignored. * @ignore_pwm: true if DPWMI should be ignored.
* @dpwm_mode: true is DPWM dimming mode, otherwise Analog dimming mode. * @dpwm_mode: true is DPWM dimming mode, otherwise Analog dimming mode.
@ -23,7 +25,7 @@
*/ */
struct sky81452_bl_platform_data { struct sky81452_bl_platform_data {
const char *name; const char *name;
int gpio_enable; struct gpio_desc *gpiod_enable;
unsigned int enable; unsigned int enable;
bool ignore_pwm; bool ignore_pwm;
bool dpwm_mode; bool dpwm_mode;