Commit 2606706e authored by Linus Walleij's avatar Linus Walleij Committed by Lee Jones

backlight: gpio_backlight: Delete pdata inversion

The option to invert the output of the GPIO (active low) is
not used by the only platform still using platform data to
set up a GPIO backlight (one SH board). Delete the option
as we do not expect to expand the use of board files for
this driver, and GPIO descriptors intrinsically keep track
of any signal inversion.
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent de738900
...@@ -25,7 +25,6 @@ struct gpio_backlight { ...@@ -25,7 +25,6 @@ struct gpio_backlight {
struct device *fbdev; struct device *fbdev;
struct gpio_desc *gpiod; struct gpio_desc *gpiod;
int active;
int def_value; int def_value;
}; };
...@@ -39,8 +38,7 @@ static int gpio_backlight_update_status(struct backlight_device *bl) ...@@ -39,8 +38,7 @@ static int gpio_backlight_update_status(struct backlight_device *bl)
bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
brightness = 0; brightness = 0;
gpiod_set_value_cansleep(gbl->gpiod, gpiod_set_value_cansleep(gbl->gpiod, brightness);
brightness ? gbl->active : !gbl->active);
return 0; return 0;
} }
...@@ -69,8 +67,6 @@ static int gpio_backlight_probe_dt(struct platform_device *pdev, ...@@ -69,8 +67,6 @@ static int gpio_backlight_probe_dt(struct platform_device *pdev,
gbl->def_value = of_property_read_bool(np, "default-on"); gbl->def_value = of_property_read_bool(np, "default-on");
flags = gbl->def_value ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW; flags = gbl->def_value ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW;
/* GPIO descriptors keep track of inversion */
gbl->active = 1;
gbl->gpiod = devm_gpiod_get(dev, NULL, flags); gbl->gpiod = devm_gpiod_get(dev, NULL, flags);
if (IS_ERR(gbl->gpiod)) { if (IS_ERR(gbl->gpiod)) {
...@@ -121,15 +117,8 @@ static int gpio_backlight_probe(struct platform_device *pdev) ...@@ -121,15 +117,8 @@ static int gpio_backlight_probe(struct platform_device *pdev)
unsigned long flags = GPIOF_DIR_OUT; unsigned long flags = GPIOF_DIR_OUT;
gbl->fbdev = pdata->fbdev; gbl->fbdev = pdata->fbdev;
gbl->active = pdata->active_low ? 0 : 1;
gbl->def_value = pdata->def_value; gbl->def_value = pdata->def_value;
flags |= gbl->def_value ? GPIOF_INIT_HIGH : GPIOF_INIT_LOW;
if (gbl->active)
flags |= gbl->def_value ?
GPIOF_INIT_HIGH : GPIOF_INIT_LOW;
else
flags |= gbl->def_value ?
GPIOF_INIT_LOW : GPIOF_INIT_HIGH;
ret = devm_gpio_request_one(gbl->dev, pdata->gpio, flags, ret = devm_gpio_request_one(gbl->dev, pdata->gpio, flags,
pdata ? pdata->name : "backlight"); pdata ? pdata->name : "backlight");
......
...@@ -14,7 +14,6 @@ struct gpio_backlight_platform_data { ...@@ -14,7 +14,6 @@ struct gpio_backlight_platform_data {
struct device *fbdev; struct device *fbdev;
int gpio; int gpio;
int def_value; int def_value;
bool active_low;
const char *name; const char *name;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment