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 11/12] pwm-backlight: Add power supply support
Date: Mon,  7 Oct 2013 13:37:45 +0200	[thread overview]
Message-ID: <1381145866-445-12-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1381145866-445-1-git-send-email-treding@nvidia.com>

Backlights require a power supply to work properly. This commit adds a
regulator to power up and power down the backlight.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
Changes in v2:
- make regulator mandatory and update commit message accordingly

 .../devicetree/bindings/video/backlight/pwm-backlight.txt   |  2 ++
 drivers/video/backlight/pwm_bl.c                            | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt b/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
index 72810cc..764db86 100644
--- a/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
+++ b/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
@@ -10,6 +10,7 @@ Required properties:
       last value in the array represents a 100% duty cycle (brightest).
   - default-brightness-level: the default brightness level (index into the
       array defined by the "brightness-levels" property)
+  - power-supply: regulator for supply voltage
 
 Optional properties:
   - pwm-names: a list of names for the PWM devices specified in the
@@ -29,5 +30,6 @@ Example:
 		brightness-levels = <0 4 8 16 32 64 128 255>;
 		default-brightness-level = <6>;
 
+		power-supply = <&vdd_bl_reg>;
 		enable-gpios = <&gpio 58 0>;
 	};
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index cdef4a3..eec6c98 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
+#include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 
 struct pwm_bl_data {
@@ -30,6 +31,7 @@ struct pwm_bl_data {
 	unsigned int		lth_brightness;
 	unsigned int		*levels;
 	bool			enabled;
+	struct regulator	*power_supply;
 	int			enable_gpio;
 	unsigned long		enable_gpio_flags;
 	int			(*notify)(struct device *,
@@ -60,6 +62,10 @@ static void pwm_backlight_power_on(struct pwm_bl_data *pb, int brightness,
 
 	pwm_config(pb->pwm, duty_cycle, pb->period);
 
+	err = regulator_enable(pb->power_supply);
+	if (err < 0)
+		dev_err(pb->dev, "failed to enable power supply\n");
+
 	if (gpio_is_valid(pb->enable_gpio)) {
 		if (pb->enable_gpio_flags & PWM_BACKLIGHT_GPIO_ACTIVE_LOW)
 			gpio_set_value(pb->enable_gpio, 0);
@@ -86,6 +92,7 @@ static void pwm_backlight_power_off(struct pwm_bl_data *pb)
 			gpio_set_value(pb->enable_gpio, 0);
 	}
 
+	regulator_disable(pb->power_supply);
 	pb->enabled = false;
 }
 
@@ -268,6 +275,12 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 		}
 	}
 
+	pb->power_supply = devm_regulator_get(&pdev->dev, "power");
+	if (IS_ERR(pb->power_supply)) {
+		ret = PTR_ERR(pb->power_supply);
+		goto err_gpio;
+	}
+
 	pb->pwm = devm_pwm_get(&pdev->dev, NULL);
 	if (IS_ERR(pb->pwm)) {
 		dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n");
-- 
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 ` [PATCH v2 03/12] pwm-backlight: Track enable state Thierry Reding
2013-10-07 11:37 ` [PATCH v2 04/12] pwm-backlight: Add optional enable GPIO 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
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 ` Thierry Reding [this message]
2013-10-07 11:37 ` [PATCH v2 12/12] pwm-backlight: Allow backlight to remain disabled on boot Thierry Reding
     [not found] ` <CAH9NwWfDRiQ3FegMyx1YBQ5jUgPvc7h2cxd3KgyeDdnsq6UgMw@mail.gmail.com>
2013-11-08 12:36   ` [PATCH v2 00/12] pwm-backlight: Add GPIO and power supply support 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-12-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).