Commit 892c7788 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Daniel Thompson

backlight: pwm_bl: Fix GPIO out for unimplemented .get_direction()

Commit 7613c922 ("backlight: pwm_bl: Move the checks for initial
power state to a separate function") not just moved some code, but made
slight changes in semantics.

If a gpiochip doesn't implement the optional .get_direction() callback,
gpiod_get_direction always returns -EINVAL, which is never equal to
GPIOF_DIR_IN, leading to the GPIO not being configured for output.

To avoid this, invert the test and check for not GPIOF_DIR_OUT instead,
like the original code did.

This restores the display on r8a7740/armadillo.

Fixes: 7613c922 ("backlight: pwm_bl: Move the checks for initial power state to a separate function")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
parent 4f7d029b
...@@ -297,14 +297,15 @@ static int pwm_backlight_probe(struct platform_device *pdev) ...@@ -297,14 +297,15 @@ static int pwm_backlight_probe(struct platform_device *pdev)
} }
/* /*
* If the GPIO is configured as input, change the direction to output * If the GPIO is not known to be already configured as output, that
* and set the GPIO as active. * is, if gpiod_get_direction returns either GPIOF_DIR_IN or -EINVAL,
* change the direction to output and set the GPIO as active.
* Do not force the GPIO to active when it was already output as it * Do not force the GPIO to active when it was already output as it
* could cause backlight flickering or we would enable the backlight too * could cause backlight flickering or we would enable the backlight too
* early. Leave the decision of the initial backlight state for later. * early. Leave the decision of the initial backlight state for later.
*/ */
if (pb->enable_gpio && if (pb->enable_gpio &&
gpiod_get_direction(pb->enable_gpio) == GPIOF_DIR_IN) gpiod_get_direction(pb->enable_gpio) != GPIOF_DIR_OUT)
gpiod_direction_output(pb->enable_gpio, 1); gpiod_direction_output(pb->enable_gpio, 1);
pb->power_supply = devm_regulator_get(&pdev->dev, "power"); pb->power_supply = devm_regulator_get(&pdev->dev, "power");
......
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