Merge remote-tracking branches 'regulator/topic/act8865', 'regulator/topic/arizona-ldo1', 'regulator/topic/arizona-micsupp' and 'regulator/topic/da9211' into regulator-next

2015-04-10 19:16:00 +01:00
parent 5fc31b43d5 c8b263cc03 ec454d7016 a7b976ae4b a46a0730f5
commit e5073849f9
6 changed files with 189 additions and 31 deletions
--- a/include/linux/regulator/act8865.h
+++ b/include/linux/regulator/act8865.h
@@ -18,6 +18,19 @@

 #include <linux/regulator/machine.h>

+enum {
+	ACT8600_ID_DCDC1,
+	ACT8600_ID_DCDC2,
+	ACT8600_ID_DCDC3,
+	ACT8600_ID_SUDCDC4,
+	ACT8600_ID_LDO5,
+	ACT8600_ID_LDO6,
+	ACT8600_ID_LDO7,
+	ACT8600_ID_LDO8,
+	ACT8600_ID_LDO9,
+	ACT8600_ID_LDO10,
+};
+
 enum {
 	ACT8865_ID_DCDC1,
 	ACT8865_ID_DCDC2,
@@ -46,6 +59,7 @@ enum {
 };

 enum {
+	ACT8600,
 	ACT8865,
 	ACT8846,
 };