devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>,
	Eric Miao <eric.y.miao@gmail.com>,
	Haojian Zhuang <haojian.zhuang@gmail.com>,
	Marek Vasut <marek.vasut@gmail.com>,
	Ben Dooks <ben-linux@fluff.org>,
	Kukjin Kim <kgene.kim@samsung.com>,
	Guan Xuetao <gxt@mprc.pku.edu.cn>,
	devicetree@vger.kernel.org, linux-pwm@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 03/12] pwm-backlight: Track enable state
Date: Mon,  7 Oct 2013 13:37:37 +0200	[thread overview]
Message-ID: <1381145866-445-4-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1381145866-445-1-git-send-email-treding@nvidia.com>

Follow up patches will add support for more complex means of powering
the backlight on and off such as using a regulator. To prevent calls to
the regulator API from becoming unbalanced, keep track of the enabled
state internally.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/video/backlight/pwm_bl.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index ab9d5e6..4053efb 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -27,6 +27,7 @@ struct pwm_bl_data {
 	unsigned int		period;
 	unsigned int		lth_brightness;
 	unsigned int		*levels;
+	bool			enabled;
 	int			(*notify)(struct device *,
 					  int brightness);
 	void			(*notify_after)(struct device *,
@@ -40,6 +41,9 @@ static void pwm_backlight_power_on(struct pwm_bl_data *pb, int brightness,
 {
 	int duty_cycle, err;
 
+	if (pb->enabled)
+		return;
+
 	if (pb->levels) {
 		duty_cycle = pb->levels[brightness];
 		max = pb->levels[max];
@@ -52,12 +56,18 @@ static void pwm_backlight_power_on(struct pwm_bl_data *pb, int brightness,
 
 	pwm_config(pb->pwm, duty_cycle, pb->period);
 	pwm_enable(pb->pwm);
+	pb->enabled = true;
 }
 
 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);
+
+	pb->enabled = false;
 }
 
 static int pwm_backlight_update_status(struct backlight_device *bl)
@@ -216,6 +226,7 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 	pb->check_fb = data->check_fb;
 	pb->exit = data->exit;
 	pb->dev = &pdev->dev;
+	pb->enabled = false;
 
 	pb->pwm = devm_pwm_get(&pdev->dev, NULL);
 	if (IS_ERR(pb->pwm)) {
-- 
1.8.4

  parent reply	other threads:[~2013-10-07 11:37 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-07 11:37 [PATCH v2 00/12] pwm-backlight: Add GPIO and power supply support Thierry Reding
2013-10-07 11:37 ` [PATCH v2 02/12] pwm-backlight: Refactor backlight power on/off Thierry Reding
2013-10-07 11:37 ` Thierry Reding [this message]
2013-10-07 11:37 ` [PATCH v2 04/12] pwm-backlight: Add optional enable GPIO Thierry Reding
2013-10-07 11:37 ` [PATCH v2 08/12] ARM: shmobile: Initialize PWM backlight enable_gpio field Thierry Reding
2013-10-07 11:37 ` [PATCH v2 09/12] unicore32: " Thierry Reding
2013-10-07 11:37 ` [PATCH v2 10/12] pwm-backlight: Use new " Thierry Reding
2013-10-07 11:37 ` [PATCH v2 11/12] pwm-backlight: Add power supply support Thierry Reding
2013-10-07 11:37 ` [PATCH v2 12/12] pwm-backlight: Allow backlight to remain disabled on boot Thierry Reding
     [not found] ` <1381145866-445-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-10-07 11:37   ` [PATCH v2 01/12] pwm-backlight: Improve readability Thierry Reding
2013-10-07 11:37   ` [PATCH v2 05/12] ARM: OMAP: Initialize PWM backlight enable_gpio field Thierry Reding
2013-10-07 11:37   ` [PATCH v2 06/12] ARM: pxa: " Thierry Reding
2013-10-07 11:37   ` [PATCH v2 07/12] ARM: SAMSUNG: " Thierry Reding
2013-11-07 12:44   ` [PATCH v2 00/12] pwm-backlight: Add GPIO and power supply support Christian Gmeiner
     [not found] ` <CAH9NwWfDRiQ3FegMyx1YBQ5jUgPvc7h2cxd3KgyeDdnsq6UgMw@mail.gmail.com>
2013-11-08 12:36   ` Thierry Reding
     [not found]     ` <20131108123619.GC31551-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2013-11-08 13:58       ` Christian Gmeiner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1381145866-445-4-git-send-email-treding@nvidia.com \
    --to=thierry.reding@gmail.com \
    --cc=ben-linux@fluff.org \
    --cc=devicetree@vger.kernel.org \
    --cc=eric.y.miao@gmail.com \
    --cc=gxt@mprc.pku.edu.cn \
    --cc=haojian.zhuang@gmail.com \
    --cc=kgene.kim@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=marek.vasut@gmail.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).