diff options
| author | Lee Jones <lee.jones@linaro.org> | 2014-05-27 06:41:14 -0400 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-05-27 06:41:14 -0400 |
| commit | 4bd5e3049b44f2d71b4c5df194e4ebcc7e41a649 (patch) | |
| tree | 8396a08eae9cc3d9546c5ce18347fb05727093f6 /include/linux/mfd | |
| parent | 2cce4be9e6b885c595816c45a80bcce95dae6d30 (diff) | |
| parent | 6c46ccc8bb0660c1805f6662d4646eb5405dcb2d (diff) | |
Merge tag 'regulator-tps658640' into ib-from-regulator-3.16
regulator: Support newer revisions of tps658640
There are two different variants of the tps658640 with slightly
different feature sets.
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/tps6586x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h index cbecec2e353a..96187ed9f9bb 100644 --- a/include/linux/mfd/tps6586x.h +++ b/include/linux/mfd/tps6586x.h | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | #define TPS658621A 0x15 | 17 | #define TPS658621A 0x15 |
| 18 | #define TPS658621CD 0x2c | 18 | #define TPS658621CD 0x2c |
| 19 | #define TPS658623 0x1b | 19 | #define TPS658623 0x1b |
| 20 | #define TPS658640 0x01 | ||
| 21 | #define TPS658640v2 0x02 | ||
| 20 | #define TPS658643 0x03 | 22 | #define TPS658643 0x03 |
| 21 | 23 | ||
| 22 | enum { | 24 | enum { |