From: Johan Hovold <jhovold@gmail.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: Rob Landley <rob@landley.net>, Richard Purdie <rpurdie@rpsys.net>,
Jonathan Cameron <jic23@cam.ac.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
Arnd Bergmann <arnd@arndb.de>,
Andrew Morton <akpm@linux-foundation.org>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <jhovold@gmail.com>
Subject: [PATCH 1/2] mfd: lm3533: add boost frequency and ovp to platform data
Date: Thu, 10 May 2012 14:11:28 +0200 [thread overview]
Message-ID: <1336651889-6425-1-git-send-email-jhovold@gmail.com> (raw)
In-Reply-To: <20120510120742.GA29437@localhost>
Add boost-frequency and over-voltage-protection settings to platform
data.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
drivers/mfd/lm3533-core.c | 50 ++++++++++++++++++++++++++++++++++++++++++++
include/linux/mfd/lm3533.h | 15 +++++++++++++
2 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index 75f4b7f..053438c 100644
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -138,6 +138,35 @@ int lm3533_update(struct lm3533 *lm3533, u8 reg, u8 val, u8 mask)
}
EXPORT_SYMBOL_GPL(lm3533_update);
+static int lm3533_set_boost_freq(struct lm3533 *lm3533,
+ enum lm3533_boost_freq freq)
+{
+ int ret;
+
+ ret = lm3533_update(lm3533, LM3533_REG_BOOST_PWM,
+ freq << LM3533_BOOST_FREQ_SHIFT,
+ LM3533_BOOST_FREQ_MASK);
+ if (ret)
+ dev_err(lm3533->dev, "failed to set boost frequency\n");
+
+ return ret;
+}
+
+
+static int lm3533_set_boost_ovp(struct lm3533 *lm3533,
+ enum lm3533_boost_ovp ovp)
+{
+ int ret;
+
+ ret = lm3533_update(lm3533, LM3533_REG_BOOST_PWM,
+ ovp << LM3533_BOOST_OVP_SHIFT,
+ LM3533_BOOST_OVP_MASK);
+ if (ret)
+ dev_err(lm3533->dev, "failed to set boost ovp\n");
+
+ return ret;
+}
+
/*
* HVLED output config -- output hvled controlled by backlight bl
*/
@@ -521,6 +550,22 @@ static int __devinit lm3533_device_led_init(struct lm3533 *lm3533)
return 0;
}
+static int __devinit lm3533_device_setup(struct lm3533 *lm3533,
+ struct lm3533_platform_data *pdata)
+{
+ int ret;
+
+ ret = lm3533_set_boost_freq(lm3533, pdata->boost_freq);
+ if (ret)
+ return ret;
+
+ ret = lm3533_set_boost_ovp(lm3533, pdata->boost_ovp);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
static int __devinit lm3533_device_init(struct lm3533 *lm3533)
{
struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
@@ -550,6 +595,10 @@ static int __devinit lm3533_device_init(struct lm3533 *lm3533)
lm3533_enable(lm3533);
+ ret = lm3533_device_setup(lm3533, pdata);
+ if (ret)
+ goto err_disable;
+
lm3533_device_als_init(lm3533);
lm3533_device_bl_init(lm3533);
lm3533_device_led_init(lm3533);
@@ -564,6 +613,7 @@ static int __devinit lm3533_device_init(struct lm3533 *lm3533)
err_unregister:
mfd_remove_devices(lm3533->dev);
+err_disable:
lm3533_disable(lm3533);
if (gpio_is_valid(lm3533->gpio_hwen))
gpio_free(lm3533->gpio_hwen);
diff --git a/include/linux/mfd/lm3533.h b/include/linux/mfd/lm3533.h
index 75f85f3..3361137 100644
--- a/include/linux/mfd/lm3533.h
+++ b/include/linux/mfd/lm3533.h
@@ -59,9 +59,24 @@ struct lm3533_led_platform_data {
u8 pwm; /* 0 - 0x3f */
};
+enum lm3533_boost_freq {
+ LM3533_BOOST_FREQ_500KHZ,
+ LM3533_BOOST_FREQ_1000KHZ,
+};
+
+enum lm3533_boost_ovp {
+ LM3533_BOOST_OVP_16V,
+ LM3533_BOOST_OVP_24V,
+ LM3533_BOOST_OVP_32V,
+ LM3533_BOOST_OVP_40V,
+};
+
struct lm3533_platform_data {
int gpio_hwen;
+ enum lm3533_boost_ovp boost_ovp;
+ enum lm3533_boost_freq boost_freq;
+
struct lm3533_als_platform_data *als;
struct lm3533_bl_platform_data *backlights;
--
1.7.8.5
next prev parent reply other threads:[~2012-05-10 12:11 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-20 15:30 [PATCH 0/4] mfd: add LM3533 lighting-power chip driver Johan Hovold
2012-04-20 15:30 ` [PATCH 1/4] mfd: add LM3533 lighting-power core driver Johan Hovold
2012-04-26 12:41 ` Mark Brown
2012-05-03 10:15 ` Johan Hovold
2012-05-03 10:22 ` Johan Hovold
2012-04-20 15:30 ` [PATCH 2/4] misc: add LM3533 ambient light sensor driver Johan Hovold
2012-04-20 15:57 ` Greg Kroah-Hartman
2012-04-20 17:28 ` Johan Hovold
2012-04-20 17:37 ` Greg Kroah-Hartman
2012-04-26 11:52 ` Johan Hovold
2012-04-20 15:30 ` [PATCH 3/4] leds: add LM3533 LED driver Johan Hovold
2012-04-20 16:10 ` Arnd Bergmann
2012-04-20 16:45 ` Johan Hovold
2012-04-20 15:30 ` [PATCH 4/4] backlight: add LM3533 backlight driver Johan Hovold
2012-05-03 10:26 ` [PATCH v2 0/4] mfd: add LM3533 lighting-power chip driver Johan Hovold
2012-05-03 10:26 ` [PATCH v2 1/4] mfd: add LM3533 lighting-power core driver Johan Hovold
2012-05-03 10:38 ` Mark Brown
2012-05-03 11:28 ` Johan Hovold
2012-05-03 11:38 ` Mark Brown
2012-05-03 15:00 ` Johan Hovold
2012-05-03 15:24 ` Mark Brown
2012-05-03 16:54 ` Johan Hovold
2012-05-03 16:57 ` Mark Brown
2012-05-03 17:14 ` Johan Hovold
2012-05-03 17:23 ` Mark Brown
2012-05-03 17:31 ` Johan Hovold
2012-05-09 14:42 ` Samuel Ortiz
2012-05-10 12:07 ` Johan Hovold
2012-05-10 12:11 ` Johan Hovold [this message]
2012-05-10 12:11 ` [PATCH 2/2] mfd: lm3533: remove boost attributes Johan Hovold
2012-05-10 17:18 ` [PATCH 0/2] mfd: lm3533: update max-current interface Johan Hovold
2012-05-10 17:18 ` [PATCH 1/2] mfd: lm3533: remove unused max-current function Johan Hovold
2012-05-10 17:18 ` [PATCH 2/2] mfd: lm3533: use SI-units for max-current interface Johan Hovold
2012-05-11 13:32 ` [PATCH v2 1/4] mfd: add LM3533 lighting-power core driver Samuel Ortiz
2012-05-03 10:26 ` [PATCH v2 2/4] iio: add LM3533 ambient light sensor driver Johan Hovold
2012-05-03 11:40 ` Jonathan Cameron
2012-05-03 16:36 ` Johan Hovold
2012-05-08 13:47 ` Jonathan Cameron
2012-05-15 16:44 ` Johan Hovold
2012-05-15 20:00 ` Jonathan Cameron
2012-05-16 13:05 ` Johan Hovold
2012-05-16 14:21 ` Jonathan Cameron
2012-05-18 12:27 ` Johan Hovold
2012-05-18 17:34 ` Jonathan Cameron
2012-05-18 17:57 ` Johan Hovold
2012-05-19 8:04 ` Jonathan Cameron
2012-05-15 16:46 ` [PATCH v3] iio: add LM3533 ambient-light-sensor driver Johan Hovold
2012-05-15 19:27 ` Andrew Morton
2012-05-15 20:00 ` Johan Hovold
2012-05-15 20:16 ` Jonathan Cameron
2012-05-18 13:07 ` [PATCH v4] " Johan Hovold
2012-05-19 8:48 ` Jonathan Cameron
2012-05-19 16:30 ` Johan Hovold
2012-05-19 13:26 ` Jonathan Cameron
2012-05-21 9:50 ` Johan Hovold
2012-05-21 16:37 ` Jonathan Cameron
2012-05-21 22:07 ` Johan Hovold
2012-05-22 7:13 ` Jonathan Cameron
2012-05-22 9:09 ` Johan Hovold
2012-05-22 9:15 ` Jonathan Cameron
2012-05-22 7:45 ` Michael Hennerich
2012-05-22 7:49 ` Jonathan Cameron
2012-05-22 8:11 ` Michael Hennerich
2012-05-22 8:20 ` Jonathan Cameron
2012-05-21 12:18 ` [PATCH v5] " Johan Hovold
2012-05-22 9:19 ` Jonathan Cameron
2012-05-22 9:40 ` Johan Hovold
2012-05-22 13:55 ` Greg Kroah-Hartman
2012-06-05 4:11 ` Greg Kroah-Hartman
2012-05-03 10:26 ` [PATCH v2 3/4] leds: add LM3533 LED driver Johan Hovold
2012-05-03 10:43 ` Mark Brown
2012-05-03 11:50 ` Johan Hovold
2012-05-03 14:51 ` Mark Brown
2012-05-03 16:46 ` Johan Hovold
2012-05-10 18:27 ` [PATCH v3] " Johan Hovold
2012-05-10 18:48 ` Andrew Morton
2012-05-11 9:54 ` Johan Hovold
2012-05-11 22:24 ` Andrew Morton
2012-05-14 10:25 ` Johan Hovold
2012-05-14 10:31 ` [PATCH v4] " Johan Hovold
2012-05-03 10:26 ` [PATCH v2 4/4] backlight: add LM3533 backlight driver Johan Hovold
2012-05-10 18:29 ` [PATCH v3] " Johan Hovold
2012-05-15 19:13 ` [PATCH v4] " Johan Hovold
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=1336651889-6425-1-git-send-email-jhovold@gmail.com \
--to=jhovold@gmail.com \
--cc=FlorianSchandinat@gmx.de \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@cam.ac.uk \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rob@landley.net \
--cc=rpurdie@rpsys.net \
--cc=sameo@linux.intel.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).