From patchwork Fri Sep 30 07:02:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 676892 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3slj8Y3r8Dz9s2G for ; Fri, 30 Sep 2016 17:03:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754573AbcI3HDY (ORCPT ); Fri, 30 Sep 2016 03:03:24 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:46575 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754035AbcI3HDT (ORCPT ); Fri, 30 Sep 2016 03:03:19 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id u8U739qN015998; Fri, 30 Sep 2016 02:03:09 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id u8U738K9001061; Fri, 30 Sep 2016 02:03:08 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.294.0; Fri, 30 Sep 2016 02:03:07 -0500 Received: from dlep33.itg.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id u8U7306b008255; Fri, 30 Sep 2016 02:03:05 -0500 From: Peter Ujfalusi To: , , CC: , , , , Subject: [PATCH 2/2] backlight: pwm_bl: Check the pwm state for initial backlight power state Date: Fri, 30 Sep 2016 10:02:59 +0300 Message-ID: <20160930070259.5710-3-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20160930070259.5710-1-peter.ujfalusi@ti.com> References: <20160930070259.5710-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org 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 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; }