aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 08:57:31 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 08:57:31 -0400
commit5cbad7d39ad229c68a724e5e139fd845b93766b2 (patch)
tree4090a6b3ab23e093547f9e5841131ea821c456f6 /include/linux/mfd
parent3c307826258dc2daafc13c429d32b74fef407ba4 (diff)
parentda445afe357ae656f6baddd8fd58b01e923f1fc6 (diff)
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/wm8994/pdata.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index 8e21a094836d..68e776594889 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -17,6 +17,7 @@
17 17
18#define WM8994_NUM_LDO 2 18#define WM8994_NUM_LDO 2
19#define WM8994_NUM_GPIO 11 19#define WM8994_NUM_GPIO 11
20#define WM8994_NUM_AIF 3
20 21
21struct wm8994_ldo_pdata { 22struct wm8994_ldo_pdata {
22 /** GPIOs to enable regulator, 0 or less if not available */ 23 /** GPIOs to enable regulator, 0 or less if not available */
@@ -215,6 +216,13 @@ struct wm8994_pdata {
215 * system. 216 * system.
216 */ 217 */
217 bool spkmode_pu; 218 bool spkmode_pu;
219
220 /**
221 * Maximum number of channels clocks will be generated for,
222 * useful for systems where and I2S bus with multiple data
223 * lines is mastered.
224 */
225 int max_channels_clocked[WM8994_NUM_AIF];
218}; 226};
219 227
220#endif 228#endif