aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-27 09:45:55 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2009-09-17 03:46:58 -0400
commit63aed85e3535b4603798184cc941e49de386d354 (patch)
tree9fadb2c68ec7702327b725043c2e214e0263a154 /include/linux/mfd
parent7e9f9fd4b8285c52c0950a1929864346de5caa6d (diff)
mfd: Conditionally add WM831x backlight subdevice
The WM831x backlight driver requires at least the specification of the current sink to use and a maximum current to allow them to function and will actively interfere with other users of the regulators it uses if misconfigured so only register the subdevice for it if this platform data has been supplied. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/wm831x/pdata.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index 571e60136264..90d820260aad 100644
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@ -18,6 +18,11 @@
18struct wm831x; 18struct wm831x;
19struct regulator_init_data; 19struct regulator_init_data;
20 20
21struct wm831x_backlight_pdata {
22 int isink; /** ISINK to use, 1 or 2 */
23 int max_uA; /** Maximum current to allow */
24};
25
21struct wm831x_backup_pdata { 26struct wm831x_backup_pdata {
22 int charger_enable; 27 int charger_enable;
23 int no_constant_voltage; /** Disable constant voltage charging */ 28 int no_constant_voltage; /** Disable constant voltage charging */
@@ -87,6 +92,7 @@ struct wm831x_pdata {
87 int (*post_init)(struct wm831x *wm831x); 92 int (*post_init)(struct wm831x *wm831x);
88 93
89 int gpio_base; 94 int gpio_base;
95 struct wm831x_backlight_pdata *backlight;
90 struct wm831x_backup_pdata *backup; 96 struct wm831x_backup_pdata *backup;
91 struct wm831x_battery_pdata *battery; 97 struct wm831x_battery_pdata *battery;
92 struct wm831x_touch_pdata *touch; 98 struct wm831x_touch_pdata *touch;