From patchwork Fri Jun 30 11:21:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enric Balletbo i Serra X-Patchwork-Id: 9819307 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EE472603F9 for ; Fri, 30 Jun 2017 11:23:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE1D728576 for ; Fri, 30 Jun 2017 11:23:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D22FF285EA; Fri, 30 Jun 2017 11:23:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7439528607 for ; Fri, 30 Jun 2017 11:23:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752288AbdF3LVu (ORCPT ); Fri, 30 Jun 2017 07:21:50 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:37416 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751565AbdF3LVW (ORCPT ); Fri, 30 Jun 2017 07:21:22 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 4116726BF6D From: Enric Balletbo i Serra To: Thierry Reding , Lee Jones , Daniel Thompson , Jingoo Han , Bartlomiej Zolnierkiewicz , Rob Herring , Pavel Machek , Richard Purdie , Jacek Anaszewski , Heiko Stuebner Cc: linux-pwm@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, groeck@chromium.org, linux-rockchip@lists.infradead.org, huang lin Subject: [PATCH v2 2/4] pwm-backlight: add support for pwm-delay-us property Date: Fri, 30 Jun 2017 13:21:07 +0200 Message-Id: <20170630112109.13785-2-enric.balletbo@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170630112109.13785-1-enric.balletbo@collabora.com> References: <20170630112109.13785-1-enric.balletbo@collabora.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: huang lin Some panels (i.e. N116BGE-L41), in their power sequence specifications, request a delay between set the PWM signal and enable the backlight and between clear the PWM signal and disable the backlight. Add support for the new pwm-delay-us property to meet the timing. Note that this patch inverts current sequence. Before this patch the enable signal was set before the PWM signal and vice-versa on power off. I assumed that this sequence was wrong, at least it is on different panel datasheets that I checked, so I inverted the sequence to follow: On power on, set the PWM signal, wait, and set the LED_EN signal. On power off, clear the LED_EN signal, wait, and stop the PWM signal. Signed-off-by: huang lin Signed-off-by: Enric Balletbo i Serra --- Changes since v1: - As suggested by Daniel Thompson - Do not assume power-on delay and power-off delay will be the same - Move the check of dt property to the parse dt function. v1: https://lkml.org/lkml/2017/6/28/219 drivers/video/backlight/pwm_bl.c | 24 ++++++++++++++++++++---- include/linux/pwm_backlight.h | 1 + 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 002f1ce..0f5470e 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -10,6 +10,7 @@ * published by the Free Software Foundation. */ +#include #include #include #include @@ -35,6 +36,7 @@ struct pwm_bl_data { struct gpio_desc *enable_gpio; unsigned int scale; bool legacy; + unsigned int pwm_delay[2]; int (*notify)(struct device *, int brightness); void (*notify_after)(struct device *, @@ -54,10 +56,14 @@ static void pwm_backlight_power_on(struct pwm_bl_data *pb, int brightness) if (err < 0) dev_err(pb->dev, "failed to enable power supply\n"); + pwm_enable(pb->pwm); + + if (pb->pwm_delay[0]) + usleep_range(pb->pwm_delay[0], pb->pwm_delay[0] + 2000); + if (pb->enable_gpio) gpiod_set_value_cansleep(pb->enable_gpio, 1); - pwm_enable(pb->pwm); pb->enabled = true; } @@ -66,12 +72,15 @@ static void pwm_backlight_power_off(struct pwm_bl_data *pb) if (!pb->enabled) return; - pwm_config(pb->pwm, 0, pb->period); - pwm_disable(pb->pwm); - if (pb->enable_gpio) gpiod_set_value_cansleep(pb->enable_gpio, 0); + if (pb->pwm_delay[1]) + usleep_range(pb->pwm_delay[1], pb->pwm_delay[1] + 2000); + + pwm_config(pb->pwm, 0, pb->period); + pwm_disable(pb->pwm); + regulator_disable(pb->power_supply); pb->enabled = false; } @@ -174,6 +183,12 @@ static int pwm_backlight_parse_dt(struct device *dev, data->max_brightness--; } + /* read pwm to enable pre/post delays from DT property */ + ret = of_property_read_u32_array(node, "pwm-delay-us", data->pwm_delay, + ARRAY_SIZE(data->pwm_delay)); + if (ret < 0) + return ret; + data->enable_gpio = -EINVAL; return 0; } @@ -272,6 +287,7 @@ static int pwm_backlight_probe(struct platform_device *pdev) pb->exit = data->exit; pb->dev = &pdev->dev; pb->enabled = false; + memcpy(pb->pwm_delay, data->pwm_delay, sizeof(pb->pwm_delay)); pb->enable_gpio = devm_gpiod_get_optional(&pdev->dev, "enable", GPIOD_ASIS); diff --git a/include/linux/pwm_backlight.h b/include/linux/pwm_backlight.h index efdd922..bf37131 100644 --- a/include/linux/pwm_backlight.h +++ b/include/linux/pwm_backlight.h @@ -13,6 +13,7 @@ struct platform_pwm_backlight_data { unsigned int lth_brightness; unsigned int pwm_period_ns; unsigned int *levels; + unsigned int pwm_delay[2]; /* TODO remove once all users are switched to gpiod_* API */ int enable_gpio; int (*init)(struct device *dev);