Commit 61170ee9 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Lee Jones

backlight: pwm_bl: Fix devicetree parsing with auto-generated brightness tables

Commit 88ba95be ("backlight: pwm_bl: Compute brightness of LED linearly
to human eye") made the parse-dt function return early when using an auto-
generated brightness-table, but didn't take into account that some more
settings were handled below the brightness handling, like power-on-delays
and also setting the pdata enable-gpio to -EINVAL.

This surfaces for example in the case of a backlight without any
enable-gpio which then tries to use gpio-0 in error.

Fix this by simply moving the trailing settings above the brightness
handling.

Fixes: 88ba95be ("backlight: pwm_bl: Compute brightness of LED linearly to human eye")
Signed-off-by: default avatarHeiko Stuebner <heiko.stuebner@bq.com>
Acked-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent e4c8ae3e
...@@ -272,6 +272,16 @@ static int pwm_backlight_parse_dt(struct device *dev, ...@@ -272,6 +272,16 @@ static int pwm_backlight_parse_dt(struct device *dev,
memset(data, 0, sizeof(*data)); memset(data, 0, sizeof(*data));
/*
* These values are optional and set as 0 by default, the out values
* are modified only if a valid u32 value can be decoded.
*/
of_property_read_u32(node, "post-pwm-on-delay-ms",
&data->post_pwm_on_delay);
of_property_read_u32(node, "pwm-off-delay-ms", &data->pwm_off_delay);
data->enable_gpio = -EINVAL;
/* /*
* Determine the number of brightness levels, if this property is not * Determine the number of brightness levels, if this property is not
* set a default table of brightness levels will be used. * set a default table of brightness levels will be used.
...@@ -384,15 +394,6 @@ static int pwm_backlight_parse_dt(struct device *dev, ...@@ -384,15 +394,6 @@ static int pwm_backlight_parse_dt(struct device *dev,
data->max_brightness--; data->max_brightness--;
} }
/*
* These values are optional and set as 0 by default, the out values
* are modified only if a valid u32 value can be decoded.
*/
of_property_read_u32(node, "post-pwm-on-delay-ms",
&data->post_pwm_on_delay);
of_property_read_u32(node, "pwm-off-delay-ms", &data->pwm_off_delay);
data->enable_gpio = -EINVAL;
return 0; return 0;
} }
......
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