If the PWM is not enabled the backlight initially should not be enabled either if we have booted with DT and there is a phandle pointing to the backlight node.
The patch extends the checks to decide if we should keep the backlight off initially. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Philipp Zabel <[email protected]> Reviewed-by: Thierry Reding <[email protected]> --- drivers/video/backlight/pwm_bl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 5712ddd053dd..d7efcb632f7d 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -215,6 +215,10 @@ static int pwm_backlight_initial_power_state(const struct pwm_bl_data *pb) if (!regulator_is_enabled(pb->power_supply)) return FB_BLANK_POWERDOWN; + /* The PWM is disabled, keep it like this */ + if (!pwm_is_enabled(pb->pwm)) + return FB_BLANK_POWERDOWN; + return FB_BLANK_UNBLANK; } -- 2.11.0.rc2
