From: Johan Hovold <jhovold@gmail.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Richard Purdie <rpurdie@rpsys.net>,
Johan Hovold <jhovold@gmail.com>
Subject: [PATCH 2/2] mfd: lm3533: use SI-units for max-current interface
Date: Thu, 10 May 2012 19:18:29 +0200 [thread overview]
Message-ID: <1336670309-20858-3-git-send-email-jhovold@gmail.com> (raw)
In-Reply-To: <1336670309-20858-1-git-send-email-jhovold@gmail.com>
Use SI-units (uA) for max-current interface (5000 - 29800 uA).
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
drivers/mfd/lm3533-ctrlbank.c | 43 +++++++++++++++++++++++++++-------------
include/linux/mfd/lm3533.h | 7 +++--
2 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/drivers/mfd/lm3533-ctrlbank.c b/drivers/mfd/lm3533-ctrlbank.c
index adf4c1a..a4cb7a5 100644
--- a/drivers/mfd/lm3533-ctrlbank.c
+++ b/drivers/mfd/lm3533-ctrlbank.c
@@ -17,8 +17,11 @@
#include <linux/mfd/lm3533.h>
+#define LM3533_MAX_CURRENT_MIN 5000
+#define LM3533_MAX_CURRENT_MAX 29800
+#define LM3533_MAX_CURRENT_STEP 800
+
#define LM3533_BRIGHTNESS_MAX 255
-#define LM3533_MAX_CURRENT_MAX 31
#define LM3533_PWM_MAX 0x3f
#define LM3533_REG_PWM_BASE 0x14
@@ -65,6 +68,31 @@ int lm3533_ctrlbank_disable(struct lm3533_ctrlbank *cb)
}
EXPORT_SYMBOL_GPL(lm3533_ctrlbank_disable);
+/*
+ * Full-scale current.
+ *
+ * imax 5000 - 29800 uA (800 uA step)
+ */
+int lm3533_ctrlbank_set_max_current(struct lm3533_ctrlbank *cb, u16 imax)
+{
+ u8 reg;
+ u8 val;
+ int ret;
+
+ if (imax < LM3533_MAX_CURRENT_MIN || imax > LM3533_MAX_CURRENT_MAX)
+ return -EINVAL;
+
+ val = (imax - LM3533_MAX_CURRENT_MIN) / LM3533_MAX_CURRENT_STEP;
+
+ reg = lm3533_ctrlbank_get_reg(cb, LM3533_REG_MAX_CURRENT_BASE);
+ ret = lm3533_write(cb->lm3533, reg, val);
+ if (ret)
+ dev_err(cb->dev, "failed to set max current\n");
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(lm3533_ctrlbank_set_max_current);
+
#define lm3533_ctrlbank_set(_name, _NAME) \
int lm3533_ctrlbank_set_##_name(struct lm3533_ctrlbank *cb, u8 val) \
{ \
@@ -102,19 +130,6 @@ lm3533_ctrlbank_set(brightness, BRIGHTNESS);
lm3533_ctrlbank_get(brightness, BRIGHTNESS);
/*
- * Full scale current.
- *
- * Imax = 5 + val * 0.8 mA, e.g.:
- *
- * 0 - 5 mA
- * ...
- * 19 - 20.2 mA (default)
- * ...
- * 31 - 29.8 mA
- */
-lm3533_ctrlbank_set(max_current, MAX_CURRENT);
-
-/*
* PWM-input control mask:
*
* bit 5 - PWM-input enabled in Zone 4
diff --git a/include/linux/mfd/lm3533.h b/include/linux/mfd/lm3533.h
index 7cfef9e..9660feb 100644
--- a/include/linux/mfd/lm3533.h
+++ b/include/linux/mfd/lm3533.h
@@ -47,15 +47,15 @@ struct lm3533_als_platform_data {
struct lm3533_bl_platform_data {
char *name;
+ u16 max_current; /* 5000 - 29800 uA (800 uA step) */
u8 default_brightness; /* 0 - 255 */
- u8 max_current; /* 0 - 31 */
u8 pwm; /* 0 - 0x3f */
};
struct lm3533_led_platform_data {
char *name;
const char *default_trigger;
- u8 max_current; /* 0 - 31 */
+ u16 max_current; /* 5000 - 29800 uA (800 uA step) */
u8 pwm; /* 0 - 0x3f */
};
@@ -91,7 +91,8 @@ extern int lm3533_ctrlbank_disable(struct lm3533_ctrlbank *cb);
extern int lm3533_ctrlbank_set_brightness(struct lm3533_ctrlbank *cb, u8 val);
extern int lm3533_ctrlbank_get_brightness(struct lm3533_ctrlbank *cb, u8 *val);
-extern int lm3533_ctrlbank_set_max_current(struct lm3533_ctrlbank *cb, u8 val);
+extern int lm3533_ctrlbank_set_max_current(struct lm3533_ctrlbank *cb,
+ u16 imax);
extern int lm3533_ctrlbank_set_pwm(struct lm3533_ctrlbank *cb, u8 val);
extern int lm3533_ctrlbank_get_pwm(struct lm3533_ctrlbank *cb, u8 *val);
--
1.7.8.5
next prev parent reply other threads:[~2012-05-10 17:19 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 ` [PATCH 1/2] mfd: lm3533: add boost frequency and ovp to platform data Johan Hovold
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 ` Johan Hovold [this message]
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=1336670309-20858-3-git-send-email-jhovold@gmail.com \
--to=jhovold@gmail.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--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).