diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-05-08 17:16:35 -0400 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-05-09 05:51:12 -0400 |
| commit | 9c9e321455fb806108f9dbb1872bacfd42c6002b (patch) | |
| tree | 564f5a10a3614781c3f79e17410145af959f85e2 /include/linux/mfd | |
| parent | 5a826feedc331a2d5ced2afd832199a70b3af891 (diff) | |
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')
| -rw-r--r-- | include/linux/mfd/stmpe.h | 5 |
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 @@ | |||
| 11 | #include <linux/mutex.h> | 11 | #include <linux/mutex.h> |
| 12 | 12 | ||
| 13 | struct device; | 13 | struct device; |
| 14 | struct regulator; | ||
| 14 | 15 | ||
| 15 | enum stmpe_block { | 16 | enum stmpe_block { |
| 16 | STMPE_BLOCK_GPIO = 1 << 0, | 17 | STMPE_BLOCK_GPIO = 1 << 0, |
| @@ -62,6 +63,8 @@ struct stmpe_client_info; | |||
| 62 | 63 | ||
| 63 | /** | 64 | /** |
| 64 | * struct stmpe - STMPE MFD structure | 65 | * struct stmpe - STMPE MFD structure |
| 66 | * @vcc: optional VCC regulator | ||
| 67 | * @vio: optional VIO regulator | ||
| 65 | * @lock: lock protecting I/O operations | 68 | * @lock: lock protecting I/O operations |
| 66 | * @irq_lock: IRQ bus lock | 69 | * @irq_lock: IRQ bus lock |
| 67 | * @dev: device, mostly for dev_dbg() | 70 | * @dev: device, mostly for dev_dbg() |
| @@ -80,6 +83,8 @@ struct stmpe_client_info; | |||
| 80 | * @pdata: platform data | 83 | * @pdata: platform data |
| 81 | */ | 84 | */ |
| 82 | struct stmpe { | 85 | struct stmpe { |
| 86 | struct regulator *vcc; | ||
| 87 | struct regulator *vio; | ||
| 83 | struct mutex lock; | 88 | struct mutex lock; |
| 84 | struct mutex irq_lock; | 89 | struct mutex irq_lock; |
| 85 | struct device *dev; | 90 | struct device *dev; |
