regulator: initialization for ab8500 regulators

The regulators on the AB8500 have a lot of custom
hardware control settings pertaining to 8 external
signals, settings which are board-specific and need
be provided from the platform at startup.

Initialization added for regulators Vana, VextSupply1,
VextSupply2, VextSupply3, Vaux1, Vaux2, Vaux3, VTVout,
Vintcore12, Vaudio, Vdmic, Vamic1, Vamic2, VrefDDR.

Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Reviewed-by: Rickard Andersson <rickard.andersson@stericsson.com>
Reviewed-by: Jonas Aberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

2 files changed, 54 insertions, 2 deletions

diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/ab8500.h
index 56f8dea72152..6e4f77ef4d20 100644
--- a/include/linux/mfd/ab8500.h
+++ b/include/linux/mfd/ab8500.h
@@ -139,17 +139,23 @@ struct ab8500 {
         u8 oldmask[AB8500_NUM_IRQ_REGS];
 };
 
+struct regulator_reg_init;
 struct regulator_init_data;
 
 /**
  * struct ab8500_platform_data - AB8500 platform data
  * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used
  * @init: board-specific initialization after detection of ab8500
+ * @num_regulator_reg_init: number of regulator init registers
+ * @regulator_reg_init: regulator init registers
+ * @num_regulator: number of regulators
  * @regulator: machine-specific constraints for regulators
  */
 struct ab8500_platform_data {
         int irq_base;
         void (*init) (struct ab8500 *);
+        int num_regulator_reg_init;
+        struct ab8500_regulator_reg_init *regulator_reg_init;
         int num_regulator;
         struct regulator_init_data *regulator;
 };
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index d4eacdef2017..76579f964a29 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -3,8 +3,8 @@
  *
  * License Terms: GNU General Public License v2
  *
- * Author: Sundar Iyer <sundar.iyer@stericsson.com> for ST-Ericsson
- *
+ * Authors: Sundar Iyer <sundar.iyer@stericsson.com> for ST-Ericsson
+ *          Bengt Jonsson <bengt.g.jonsson@stericsson.com> for ST-Ericsson
  */
 
 #ifndef __LINUX_MFD_AB8500_REGULATOR_H
@@ -25,4 +25,50 @@ enum ab8500_regulator_id {
         AB8500_LDO_ANA,
         AB8500_NUM_REGULATORS,
 };
+
+/* AB8500 register initialization */
+struct ab8500_regulator_reg_init {
+        int id;
+        u8 value;
+};
+
+#define INIT_REGULATOR_REGISTER(_id, _value)    \
+        {                                       \
+                .id = _id,                      \
+                .value = _value,                \
+        }
+
+/* AB8500 registers */
+enum ab8500_regulator_reg {
+        AB8500_REGUREQUESTCTRL2,
+        AB8500_REGUREQUESTCTRL3,
+        AB8500_REGUREQUESTCTRL4,
+        AB8500_REGUSYSCLKREQ1HPVALID1,
+        AB8500_REGUSYSCLKREQ1HPVALID2,
+        AB8500_REGUHWHPREQ1VALID1,
+        AB8500_REGUHWHPREQ1VALID2,
+        AB8500_REGUHWHPREQ2VALID1,
+        AB8500_REGUHWHPREQ2VALID2,
+        AB8500_REGUSWHPREQVALID1,
+        AB8500_REGUSWHPREQVALID2,
+        AB8500_REGUSYSCLKREQVALID1,
+        AB8500_REGUSYSCLKREQVALID2,
+        AB8500_REGUMISC1,
+        AB8500_VAUDIOSUPPLY,
+        AB8500_REGUCTRL1VAMIC,
+        AB8500_VPLLVANAREGU,
+        AB8500_VREFDDR,
+        AB8500_EXTSUPPLYREGU,
+        AB8500_VAUX12REGU,
+        AB8500_VRF1VAUX3REGU,
+        AB8500_VAUX1SEL,
+        AB8500_VAUX2SEL,
+        AB8500_VRF1VAUX3SEL,
+        AB8500_REGUCTRL2SPARE,
+        AB8500_REGUCTRLDISCH,
+        AB8500_REGUCTRLDISCH2,
+        AB8500_VSMPS1SEL1,
+        AB8500_NUM_REGULATOR_REGISTERS,
+};
+
 #endif