8 files changed, 231 insertions, 201 deletions

diff --git a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
index bef1fbb647ca..865614b34d6f 100644
--- a/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/act8865-regulator.txt
@@ -1,13 +1,16 @@
-ACT8865 regulator
+ACT88xx regulators
 -------------------
 
 Required properties:
-- compatible: "active-semi,act8865"
+- compatible: "active-semi,act8846" or "active-semi,act8865"
 - reg: I2C slave address
 
 Any standard regulator properties can be used to configure the single regulator.
 
 The valid names for regulators are:
+        - for act8846:
+        REG1, REG2, REG3, REG4, REG5, REG6, REG7, REG8, REG9, REG10, REG11, REG12
+        - for act8865:
         DCDC_REG1, DCDC_REG2, DCDC_REG3, LDO_REG1, LDO_REG2, LDO_REG3, LDO_REG4.
 
 Example:
diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800.c
index 7a721d67e6ac..4e6c8c611905 100644
--- a/drivers/regulator/88pm800.c
+++ b/drivers/regulator/88pm800.c
@@ -52,7 +52,6 @@
 #define PM800_BUCK1_3           (0x3F)
 #define PM800_BUCK2             (0x40)
 #define PM800_BUCK3             (0x41)
-#define PM800_BUCK3             (0x41)
 #define PM800_BUCK4             (0x42)
 #define PM800_BUCK4_1           (0x43)
 #define PM800_BUCK4_2           (0x44)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index c625468c7f2c..1fda14e12ea8 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -3037,28 +3037,12 @@ static int ab8500_regulator_register(struct platform_device *pdev,
         return 0;
 }
 
-static int
-ab8500_regulator_of_probe(struct platform_device *pdev,
-                          struct device_node *np)
-{
-        struct of_regulator_match *match = abx500_regulator.match;
-        int err, i;
-
-        for (i = 0; i < abx500_regulator.info_size; i++) {
-                err = ab8500_regulator_register(
-                        pdev, match[i].init_data, i, match[i].of_node);
-                if (err)
-                        return err;
-        }
-
-        return 0;
-}
-
 static int ab8500_regulator_probe(struct platform_device *pdev)
 {
         struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
         struct device_node *np = pdev->dev.of_node;
-        int err;
+        struct of_regulator_match *match;
+        int err, i;
 
         if (!ab8500) {
                 dev_err(&pdev->dev, "null mfd parent\n");
@@ -3075,24 +3059,20 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
                         "Error parsing regulator init data: %d\n", err);
                 return err;
         }
-        return ab8500_regulator_of_probe(pdev, np);
-}
-
-static int ab8500_regulator_remove(struct platform_device *pdev)
-{
-        int err;
 
-        /* remove regulator debug */
-        err = ab8500_regulator_debug_exit(pdev);
-        if (err)
-                return err;
+        match = abx500_regulator.match;
+        for (i = 0; i < abx500_regulator.info_size; i++) {
+                err = ab8500_regulator_register(pdev, match[i].init_data, i,
+                                                match[i].of_node);
+                if (err)
+                        return err;
+        }
 
         return 0;
 }
 
 static struct platform_driver ab8500_regulator_driver = {
         .probe = ab8500_regulator_probe,
-        .remove = ab8500_regulator_remove,
         .driver         = {
                 .name   = "ab8500-regulator",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
index 89f9f0c0f64d..afd06f92dfdf 100644
--- a/drivers/regulator/act8865-regulator.c
+++ b/drivers/regulator/act8865-regulator.c
@@ -1,6 +1,7 @@
 /*
- * act8865-regulator.c - Voltage regulation for the active-semi ACT8865
- * http://www.active-semi.com/sheets/ACT8865_Datasheet.pdf
+ * act8865-regulator.c - Voltage regulation for active-semi ACT88xx PMUs
+ *
+ * http://www.active-semi.com/products/power-management-units/act88xx/
  *
  * Copyright (C) 2013 Atmel Corporation
  *
@@ -28,6 +29,40 @@
 #include <linux/regmap.h>
 
 /*
+ * ACT8846 Global Register Map.
+ */
+#define ACT8846_SYS0            0x00
+#define ACT8846_SYS1            0x01
+#define ACT8846_REG1_VSET       0x10
+#define ACT8846_REG1_CTRL       0x12
+#define ACT8846_REG2_VSET0      0x20
+#define ACT8846_REG2_VSET1      0x21
+#define ACT8846_REG2_CTRL       0x22
+#define ACT8846_REG3_VSET0      0x30
+#define ACT8846_REG3_VSET1      0x31
+#define ACT8846_REG3_CTRL       0x32
+#define ACT8846_REG4_VSET0      0x40
+#define ACT8846_REG4_VSET1      0x41
+#define ACT8846_REG4_CTRL       0x42
+#define ACT8846_REG5_VSET       0x50
+#define ACT8846_REG5_CTRL       0x51
+#define ACT8846_REG6_VSET       0x58
+#define ACT8846_REG6_CTRL       0x59
+#define ACT8846_REG7_VSET       0x60
+#define ACT8846_REG7_CTRL       0x61
+#define ACT8846_REG8_VSET       0x68
+#define ACT8846_REG8_CTRL       0x69
+#define ACT8846_REG9_VSET       0x70
+#define ACT8846_REG9_CTRL       0x71
+#define ACT8846_REG10_VSET      0x80
+#define ACT8846_REG10_CTRL      0x81
+#define ACT8846_REG11_VSET      0x90
+#define ACT8846_REG11_CTRL      0x91
+#define ACT8846_REG12_VSET      0xa0
+#define ACT8846_REG12_CTRL      0xa1
+#define ACT8846_REG13_CTRL      0xb1
+
+/*
  * ACT8865 Global Register Map.
  */
 #define ACT8865_SYS_MODE        0x00
@@ -70,7 +105,7 @@ static const struct regmap_config act8865_regmap_config = {
         .val_bits = 8,
 };
 
-static const struct regulator_linear_range act8865_volatge_ranges[] = {
+static const struct regulator_linear_range act8865_voltage_ranges[] = {
         REGULATOR_LINEAR_RANGE(600000, 0, 23, 25000),
         REGULATOR_LINEAR_RANGE(1200000, 24, 47, 50000),
         REGULATOR_LINEAR_RANGE(2400000, 48, 63, 100000),
@@ -86,114 +121,70 @@ static struct regulator_ops act8865_ops = {
         .is_enabled             = regulator_is_enabled_regmap,
 };