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.
2014-05-27 11:41:14 +01:00
parent 2cce4be9e6 6c46ccc8bb
commit 4bd5e3049b
3 changed files with 64 additions and 5 deletions
--- 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 {