Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1169084AbcKAM7x (ORCPT ); Tue, 1 Nov 2016 08:59:53 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:43329 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1169033AbcKAM7t (ORCPT ); Tue, 1 Nov 2016 08:59:49 -0400 From: Peter Ujfalusi To: , CC: , , , , Subject: [PATCH v3 2/2] backlight: pwm_bl: Check the pwm state for initial backlight power state Date: Tue, 1 Nov 2016 14:59:33 +0200 Message-ID: <20161101125933.11168-3-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161101125933.11168-1-peter.ujfalusi@ti.com> References: <20161101125933.11168-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 911 Lines: 29 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(+) 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; } -- 2.10.2