summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd/stmpe.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-05-08 23:16:35 +0200
committerLee Jones <lee.jones@linaro.org>2014-05-09 10:51:12 +0100
commit9c9e321455fb806108f9dbb1872bacfd42c6002b (patch)
tree564f5a10a3614781c3f79e17410145af959f85e2 /include/linux/mfd/stmpe.h
parent5a826feedc331a2d5ced2afd832199a70b3af891 (diff)
downloadlinux-stable-9c9e321455fb806108f9dbb1872bacfd42c6002b.tar.gz
linux-stable-9c9e321455fb806108f9dbb1872bacfd42c6002b.tar.bz2
linux-stable-9c9e321455fb806108f9dbb1872bacfd42c6002b.zip
mfd: stmpe: add optional regulators
The STMPE has VCC and VIO supply lines, and sometimes (as on Ux500) this comes from a software-controlled regulator. Make it possible to supply the STMPE with power from these regulators. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/mfd/stmpe.h')
-rw-r--r--include/linux/mfd/stmpe.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h
index 48395a69a7e9..980898620e57 100644
--- a/include/linux/mfd/stmpe.h
+++ b/include/linux/mfd/stmpe.h
@@ -11,6 +11,7 @@
#include <linux/mutex.h>
struct device;
+struct regulator;
enum stmpe_block {
STMPE_BLOCK_GPIO = 1 << 0,
@@ -62,6 +63,8 @@ struct stmpe_client_info;
/**
* struct stmpe - STMPE MFD structure
+ * @vcc: optional VCC regulator
+ * @vio: optional VIO regulator
* @lock: lock protecting I/O operations
* @irq_lock: IRQ bus lock
* @dev: device, mostly for dev_dbg()
@@ -80,6 +83,8 @@ struct stmpe_client_info;
* @pdata: platform data
*/
struct stmpe {
+ struct regulator *vcc;
+ struct regulator *vio;
struct mutex lock;
struct mutex irq_lock;
struct device *dev;