4 files changed, 80 insertions, 15 deletions

diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 75307447cef9..d8ecefaf63ca 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -322,18 +322,4 @@ struct ab8500_regulator_platform_data {
         struct regulator_init_data *ext_regulator;
 };
 
-#ifdef CONFIG_REGULATOR_AB8500_DEBUG
-int ab8500_regulator_debug_init(struct platform_device *pdev);
-int ab8500_regulator_debug_exit(struct platform_device *pdev);
-#else
-static inline int ab8500_regulator_debug_init(struct platform_device *pdev)
-{
-        return 0;
-}
-static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
-{
-        return 0;
-}
-#endif
-
 #endif
diff --git a/include/linux/regulator/act8865.h b/include/linux/regulator/act8865.h
index 49206c1b4905..b6c4909b33af 100644
--- a/include/linux/regulator/act8865.h
+++ b/include/linux/regulator/act8865.h
@@ -1,5 +1,5 @@
 /*
- * act8865.h  --  Voltage regulation for the active-semi act8865
+ * act8865.h  --  Voltage regulation for active-semi act88xx PMUs
  *
  * Copyright (C) 2013 Atmel Corporation.
  *
@@ -29,6 +29,27 @@ enum {
         ACT8865_REG_NUM,
 };
 
+enum {
+        ACT8846_ID_REG1,
+        ACT8846_ID_REG2,
+        ACT8846_ID_REG3,
+        ACT8846_ID_REG4,
+        ACT8846_ID_REG5,
+        ACT8846_ID_REG6,
+        ACT8846_ID_REG7,
+        ACT8846_ID_REG8,
+        ACT8846_ID_REG9,
+        ACT8846_ID_REG10,
+        ACT8846_ID_REG11,
+        ACT8846_ID_REG12,
+        ACT8846_REG_NUM,
+};
+
+enum {
+        ACT8865,
+        ACT8846,
+};
+
 /**
  * act8865_regulator_data - regulator data
  * @id: regulator id
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 14ec18d5e18b..f8a8733068a7 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -37,6 +37,7 @@
 
 struct device;
 struct notifier_block;
+struct regmap;
 
 /*
  * Regulator operating modes.
@@ -215,6 +216,13 @@ int regulator_set_optimum_mode(struct regulator *regulator, int load_uA);
 
 int regulator_allow_bypass(struct regulator *regulator, bool allow);
 
+struct regmap *regulator_get_regmap(struct regulator *regulator);
+int regulator_get_hardware_vsel_register(struct regulator *regulator,
+                                         unsigned *vsel_reg,
+                                         unsigned *vsel_mask);
+int regulator_list_hardware_vsel(struct regulator *regulator,
+                                 unsigned selector);
+
 /* regulator notifier block */
 int regulator_register_notifier(struct regulator *regulator,
                               struct notifier_block *nb);
@@ -457,6 +465,24 @@ static inline int regulator_allow_bypass(struct regulator *regulator,
         return 0;
 }
 
+static inline struct regmap *regulator_get_regmap(struct regulator *regulator)
+{
+        return ERR_PTR(-EOPNOTSUPP);
+}
+
+static inline int regulator_get_hardware_vsel_register(struct regulator *regulator,
+                                                       unsigned *vsel_reg,
+                                                       unsigned *vsel_mask)
+{
+        return -EOPNOTSUPP;
+}
+
+static inline int regulator_list_hardware_vsel(struct regulator *regulator,
+                                               unsigned selector)
+{
+        return -EOPNOTSUPP;
+}
+
 static inline int regulator_register_notifier(struct regulator *regulator,
                               struct notifier_block *nb)
 {
diff --git a/include/linux/regulator/da9211.h b/include/linux/regulator/da9211.h
new file mode 100644
index 000000000000..0981ce0e72cc
--- /dev/null
+++ b/include/linux/regulator/da9211.h
@@ -0,0 +1,32 @@
+/*
+ * da9211.h - Regulator device driver for DA9211
+ * Copyright (C) 2014  Dialog Semiconductor Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ */
+
+#ifndef __LINUX_REGULATOR_DA9211_H
+#define __LINUX_REGULATOR_DA9211_H
+
+#include <linux/regulator/machine.h>
+
+#define DA9211_MAX_REGULATORS   2
+
+struct da9211_pdata {
+        /*
+         * Number of buck
+         * 1 : 4 phase 1 buck
+         * 2 : 2 phase 2 buck
+         */
+        int num_buck;
+        struct regulator_init_data *init_data;
+};
+#endif