From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932510AbcJZMK7 (ORCPT ); Wed, 26 Oct 2016 08:10:59 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:38279 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753250AbcJZMK4 (ORCPT ); Wed, 26 Oct 2016 08:10:56 -0400 Date: Wed, 26 Oct 2016 13:13:29 +0100 From: Lee Jones To: Peter Ujfalusi Cc: thierry.reding@gmail.com, jingoohan1@gmail.com, tomi.valkeinen@ti.com, linux-pwm@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, p.zabel@pengutronix.de Subject: Re: [PATCH 2/2] backlight: pwm_bl: Check the pwm state for initial backlight power state Message-ID: <20161026121329.GR8574@dell> References: <20160930070259.5710-1-peter.ujfalusi@ti.com> <20160930070259.5710-3-peter.ujfalusi@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160930070259.5710-3-peter.ujfalusi@ti.com> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 30 Sep 2016, 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 > --- > drivers/video/backlight/pwm_bl.c | 4 ++++ > 1 file changed, 4 insertions(+) Makes sense to me. I'm going to apply this until someone screams at me. > diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c > index 9bc4715bf116..e4326bbf807f 100644 > --- a/drivers/video/backlight/pwm_bl.c > +++ b/drivers/video/backlight/pwm_bl.c > @@ -223,6 +223,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; > } > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog