aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/wm831x-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-27 14:45:56 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2009-09-17 09:46:59 +0200
commit6704e5171ba9053ba173bcd807c7392d2076bdb4 (patch)
tree84f91270bdf1bfbefe2e059dec395d473cbd72d0 /drivers/mfd/wm831x-core.c
parentmfd: Conditionally add WM831x backlight subdevice (diff)
downloadlinux-dev-6704e5171ba9053ba173bcd807c7392d2076bdb4.tar.xz
linux-dev-6704e5171ba9053ba173bcd807c7392d2076bdb4.zip
mfd: Add basic WM831x OTP support
The WM831x series of devices use OTP (One Time Programmable, a type of PROM) to store system configuration. At run time this data is visible via registers. Currently the only explicitly supported feature is that the unique ID provided by every WM831x device is exported to user space via sysfs. Other configuration data may be read by system-specific code in the pre_init() and post_init() platform data operations. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/wm831x-core.c')
-rw-r--r--drivers/mfd/wm831x-core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index bc40ea315cc0..33eaea2f988e 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -23,6 +23,7 @@
#include <linux/mfd/wm831x/pdata.h>
#include <linux/mfd/wm831x/irq.h>
#include <linux/mfd/wm831x/auxadc.h>
+#include <linux/mfd/wm831x/otp.h>
enum wm831x_parent {
WM8310 = 0,
@@ -1340,6 +1341,8 @@ static int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
ret);
}
+ wm831x_otp_init(wm831x);
+
if (pdata && pdata->post_init) {
ret = pdata->post_init(wm831x);
if (ret != 0) {
@@ -1360,6 +1363,7 @@ err:
static void wm831x_device_exit(struct wm831x *wm831x)
{
+ wm831x_otp_exit(wm831x);
mfd_remove_devices(wm831x->dev);
wm831x_irq_exit(wm831x);
kfree(wm831x);