linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: achew@nvidia.com (Andrew Chew)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V4 2/9] ARM: S3C24XX: Provide regulator to pwm-backlight
Date: Tue, 19 Mar 2013 11:59:26 -0700	[thread overview]
Message-ID: <1363719573-20926-3-git-send-email-achew@nvidia.com> (raw)
In-Reply-To: <1363719573-20926-1-git-send-email-achew@nvidia.com>

The pwm-backlight driver now takes a mandatory regulator that is gotten
during driver probe.  Initialize a dummy regulator to satisfy this
requirement.

Signed-off-by: Andrew Chew <achew@nvidia.com>
---
 arch/arm/mach-s3c24xx/mach-h1940.c  | 8 ++++++++
 arch/arm/mach-s3c24xx/mach-rx1950.c | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
index 8dd6601..d2594b8 100644
--- a/arch/arm/mach-s3c24xx/mach-h1940.c
+++ b/arch/arm/mach-s3c24xx/mach-h1940.c
@@ -24,6 +24,8 @@
 #include <linux/gpio.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
 #include <linux/pwm_backlight.h>
 #include <linux/i2c.h>
 #include <linux/leds.h>
@@ -497,6 +499,9 @@ static void h1940_backlight_exit(struct device *dev)
 	gpio_set_value(H1940_LATCH_MAX1698_nSHUTDOWN, 0);
 }
 
+/* Dummy regulator for pwm-backlight driver */
+static struct regulator_consumer_supply backlight_supply =
+	REGULATOR_SUPPLY("enable", "pwm-backlight");
 
 static struct platform_pwm_backlight_data backlight_data = {
 	.pwm_id         = 0,
@@ -720,6 +725,9 @@ static void __init h1940_init(void)
 	gpio_request(H1940_LATCH_SD_POWER, "SD power");
 	gpio_direction_output(H1940_LATCH_SD_POWER, 0);
 
+	regulator_register_always_on(-1, "backlight-enable",
+				     &backlight_supply, 1, 0);
+
 	platform_add_devices(h1940_devices, ARRAY_SIZE(h1940_devices));
 
 	gpio_request(S3C2410_GPA(1), "Red LED blink");
diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c
index e4d67a3..ac674b6 100644
--- a/arch/arm/mach-s3c24xx/mach-rx1950.c
+++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
@@ -25,6 +25,8 @@
 #include <linux/gpio_keys.h>
 #include <linux/device.h>
 #include <linux/pda_power.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
 #include <linux/pwm_backlight.h>
 #include <linux/pwm.h>
 #include <linux/s3c_adc_battery.h>
@@ -518,6 +520,10 @@ static int rx1950_backlight_notify(struct device *dev, int brightness)
 	return brightness;
 }
 
+/* Dummy regulator for pwm-backlight driver */
+static struct regulator_consumer_supply backlight_supply =
+	REGULATOR_SUPPLY("enable", "pwm-backlight");
+
 static struct platform_pwm_backlight_data rx1950_backlight_data = {
 	.pwm_id = 0,
 	.max_brightness = 24,
@@ -795,6 +801,9 @@ static void __init rx1950_init_machine(void)
 	gpio_direction_output(S3C2410_GPA(4), 0);
 	gpio_direction_output(S3C2410_GPJ(6), 0);
 
+	regulator_register_always_on(-1, "backlight-enable",
+				     &backlight_supply, 1, 0);
+
 	platform_add_devices(rx1950_devices, ARRAY_SIZE(rx1950_devices));
 
 	i2c_register_board_info(0, rx1950_i2c_devices,
-- 
1.8.1.5

  parent reply	other threads:[~2013-03-19 18:59 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-19 18:59 [PATCH V4 0/9] Add mandatory regulator for all users of pwm-backlight Andrew Chew
2013-03-19 18:59 ` [PATCH V4 1/9] ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight Andrew Chew
2013-03-19 18:59 ` Andrew Chew [this message]
2013-03-19 18:59 ` [PATCH V4 3/9] ARM: pxa: " Andrew Chew
2013-03-19 18:59 ` [PATCH V4 4/9] ARM: EXYNOS: " Andrew Chew
2013-03-19 18:59 ` [PATCH V4 5/9] unicore32: " Andrew Chew
2013-03-19 18:59 ` [PATCH V4 6/9] ARM: mxs: " Andrew Chew
2013-03-19 21:27   ` Marek Vasut
2013-03-19 21:31     ` Andrew Chew
2013-03-19 21:35       ` Marek Vasut
2013-03-19 22:10     ` Stephen Warren
2013-03-20  8:23       ` Mark Brown
2013-03-20 14:03         ` Marek Vasut
2013-03-20  3:13   ` Shawn Guo
2013-03-19 18:59 ` [PATCH V4 7/9] ARM: vt8500: " Andrew Chew
2013-03-20 18:18   ` [Bulk] " Tony Prisk
2013-03-19 18:59 ` [PATCH V4 8/9] ARM: tegra: " Andrew Chew
2013-03-21 20:01   ` Stephen Warren
2013-03-22 10:29   ` Thierry Reding
2013-03-19 18:59 ` [PATCH V4 9/9] pwm_bl: Add mandatory backlight enable regulator Andrew Chew
2013-03-20 18:00   ` Stephen Warren
2013-03-20 22:19     ` Thierry Reding
2013-03-20  2:14 ` [PATCH V4 0/9] Add mandatory regulator for all users of pwm-backlight Shawn Guo
2013-03-20  2:24   ` Alex Courbot
2013-03-20  3:08     ` Shawn Guo
2013-03-20  7:13     ` Tony Prisk
2013-03-22  1:57 ` Alex Courbot

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=1363719573-20926-3-git-send-email-achew@nvidia.com \
    --to=achew@nvidia.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).