diff options
| author |  Lee Jones <lee.jones@linaro.org>
| 2014-05-27 11:41:14 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org>
| 2014-05-27 11:41:14 +0100 |
| commit | 4bd5e3049b44f2d71b4c5df194e4ebcc7e41a649 (patch) | |
| tree | 8396a08eae9cc3d9546c5ce18347fb05727093f6 /include/linux/mfd | |
| parent | regulator: arizona-ldo1: Add processing of init_data from device tree (diff) | |
| parent | regulator: tps6586x: Add support for the TPS658640 (diff) | |
| download | linux-4bd5e3049b44f2d71b4c5df194e4ebcc7e41a649.tar.gz linux-4bd5e3049b44f2d71b4c5df194e4ebcc7e41a649.tar.bz2 linux-4bd5e3049b44f2d71b4c5df194e4ebcc7e41a649.zip | |
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 @@ #define TPS658621A 0x15 #define TPS658621CD 0x2c #define TPS658623 0x1b +#define TPS658640 0x01 +#define TPS658640v2 0x02 #define TPS658643 0x03 enum { |