diff mbox

[v3,2/2] backlight: pwm_bl: Check the pwm state for initial backlight power state

Message ID 20161101125933.11168-3-peter.ujfalusi@ti.com
State Superseded
Headers show

Commit Message

Peter Ujfalusi Nov. 1, 2016, 12:59 p.m. UTC
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>
---
 drivers/video/backlight/pwm_bl.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Philipp Zabel Nov. 1, 2016, 1:11 p.m. UTC | #1
Am Dienstag, den 01.11.2016, 14:59 +0200 schrieb Peter Ujfalusi:
> 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>

regards
Philipp

--
To unsubscribe from this list: send the line "unsubscribe linux-pwm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Thierry Reding Nov. 21, 2016, 8:13 a.m. UTC | #2
On Tue, Nov 01, 2016 at 02:59:33PM +0200, Peter Ujfalusi wrote:
> 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>
> ---
>  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 4b07da278b4f..f680f7b033b2 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;
>  }

I prefer "PWM" instead of "pwm" in prose (comments and commit message)
because it's an abbreviation.

Otherwise this looks correct:

Reviewed-by: Thierry Reding <treding@nvidia.com>
diff mbox

Patch

diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 4b07da278b4f..f680f7b033b2 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;
 }