backlight: pwm_bl: Check the PWM state for initial backlight power state

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 <peter.ujfalusi@ti.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 5712ddd053dddee04d8dd5f855e8fa3c6ae930c3..d7efcb632f7d9dde08b0a494c455725b05d55af0 100644 (file)
--- 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;
 }