1 files changed, 74 insertions, 15 deletions

diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c
index 4932e3449fe1..0801a6d0c122 100644
--- a/drivers/regulator/mc13783-regulator.c
+++ b/drivers/regulator/mc13783-regulator.c
@@ -21,6 +21,30 @@
 #include <linux/module.h>
 #include "mc13xxx.h"
 
+#define MC13783_REG_SWITCHERS0                  24
+/* Enable does not exist for SW1A */
+#define MC13783_REG_SWITCHERS0_SW1AEN                   0
+#define MC13783_REG_SWITCHERS0_SW1AVSEL                 0
+#define MC13783_REG_SWITCHERS0_SW1AVSEL_M               (63 << 0)
+
+#define MC13783_REG_SWITCHERS1                  25
+/* Enable does not exist for SW1B */
+#define MC13783_REG_SWITCHERS1_SW1BEN                   0
+#define MC13783_REG_SWITCHERS1_SW1BVSEL                 0
+#define MC13783_REG_SWITCHERS1_SW1BVSEL_M               (63 << 0)
+
+#define MC13783_REG_SWITCHERS2                  26
+/* Enable does not exist for SW2A */
+#define MC13783_REG_SWITCHERS2_SW2AEN                   0
+#define MC13783_REG_SWITCHERS2_SW2AVSEL                 0
+#define MC13783_REG_SWITCHERS2_SW2AVSEL_M               (63 << 0)
+
+#define MC13783_REG_SWITCHERS3                  27
+/* Enable does not exist for SW2B */
+#define MC13783_REG_SWITCHERS3_SW2BEN                   0
+#define MC13783_REG_SWITCHERS3_SW2BVSEL                 0
+#define MC13783_REG_SWITCHERS3_SW2BVSEL_M               (63 << 0)
+
 #define MC13783_REG_SWITCHERS5                  29
 #define MC13783_REG_SWITCHERS5_SW3EN                    (1 << 20)
 #define MC13783_REG_SWITCHERS5_SW3VSEL                  18
@@ -93,6 +117,44 @@
 
 
 /* Voltage Values */
+static const int mc13783_sw1x_val[] = {
+        900000, 925000, 950000, 975000,
+        1000000, 1025000, 1050000, 1075000,
+        1100000, 1125000, 1150000, 1175000,
+        1200000, 1225000, 1250000, 1275000,
+        1300000, 1325000, 1350000, 1375000,
+        1400000, 1425000, 1450000, 1475000,
+        1500000, 1525000, 1550000, 1575000,
+        1600000, 1625000, 1650000, 1675000,
+        1700000, 1700000, 1700000, 1700000,
+        1800000, 1800000, 1800000, 1800000,
+        1850000, 1850000, 1850000, 1850000,
+        2000000, 2000000, 2000000, 2000000,
+        2100000, 2100000, 2100000, 2100000,
+        2200000, 2200000, 2200000, 2200000,
+        2200000, 2200000, 2200000, 2200000,
+        2200000, 2200000, 2200000, 2200000,
+};
+
+static const int mc13783_sw2x_val[] = {
+        900000, 925000, 950000, 975000,
+        1000000, 1025000, 1050000, 1075000,
+        1100000, 1125000, 1150000, 1175000,
+        1200000, 1225000, 1250000, 1275000,
+        1300000, 1325000, 1350000, 1375000,
+        1400000, 1425000, 1450000, 1475000,
+        1500000, 1525000, 1550000, 1575000,
+        1600000, 1625000, 1650000, 1675000,
+        1700000, 1700000, 1700000, 1700000,
+        1800000, 1800000, 1800000, 1800000,
+        1900000, 1900000, 1900000, 1900000,
+        2000000, 2000000, 2000000, 2000000,
+        2100000, 2100000, 2100000, 2100000,
+        2200000, 2200000, 2200000, 2200000,
+        2200000, 2200000, 2200000, 2200000,
+        2200000, 2200000, 2200000, 2200000,
+};
+
 static const unsigned int mc13783_sw3_val[] = {
         5000000, 5000000, 5000000, 5500000,
 };
@@ -188,6 +250,10 @@ static struct regulator_ops mc13783_gpo_regulator_ops;
         MC13783_DEFINE(REG, _name, _reg, _vsel_reg, _voltages)
 
 static struct mc13xxx_regulator mc13783_regulators[] = {
+        MC13783_DEFINE_SW(SW1A, SWITCHERS0, SWITCHERS0, mc13783_sw1x_val),
+        MC13783_DEFINE_SW(SW1B, SWITCHERS1, SWITCHERS1, mc13783_sw1x_val),
+        MC13783_DEFINE_SW(SW2A, SWITCHERS2, SWITCHERS2, mc13783_sw2x_val),
+        MC13783_DEFINE_SW(SW2B, SWITCHERS3, SWITCHERS3, mc13783_sw2x_val),
         MC13783_DEFINE_SW(SW3, SWITCHERS5, SWITCHERS5, mc13783_sw3_val),
 
         MC13783_FIXED_DEFINE(REG, VAUDIO, REGULATORMODE0, mc13783_vaudio_val),
@@ -238,9 +304,10 @@ static int mc13783_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask,
 
         BUG_ON(val & ~mask);
 
+        mc13xxx_lock(priv->mc13xxx);
         ret = mc13xxx_reg_read(mc13783, MC13783_REG_POWERMISC, &valread);
         if (ret)
-                return ret;
+                goto out;
 
         /* Update the stored state for Power Gates. */
         priv->powermisc_pwgt_state =
@@ -253,7 +320,10 @@ static int mc13783_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask,
         valread = (valread & ~MC13783_REG_POWERMISC_PWGTSPI_M) |
                                                 priv->powermisc_pwgt_state;
 
-        return mc13xxx_reg_write(mc13783, MC13783_REG_POWERMISC, valread);
+        ret = mc13xxx_reg_write(mc13783, MC13783_REG_POWERMISC, valread);
+out:
+        mc13xxx_unlock(priv->mc13xxx);
+        return ret;
 }
 
 static int mc13783_gpo_regulator_enable(struct regulator_dev *rdev)
@@ -261,7 +331,6 @@ static int mc13783_gpo_regulator_enable(struct regulator_dev *rdev)
         struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);
         struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;
         int id = rdev_get_id(rdev);
-        int ret;
         u32 en_val = mc13xxx_regulators[id].enable_bit;
 
         dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
@@ -271,12 +340,8 @@ static int mc13783_gpo_regulator_enable(struct regulator_dev *rdev)
             id == MC13783_REG_PWGT2SPI)
                 en_val = 0;
 
-        mc13xxx_lock(priv->mc13xxx);
-        ret = mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit,
+        return mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit,
                                         en_val);
-        mc13xxx_unlock(priv->mc13xxx);
-
-        return ret;
 }
 
 static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev)
@@ -284,7 +349,6 @@ static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev)
         struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);
         struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;
         int id = rdev_get_id(rdev);
-        int ret;
         u32 dis_val = 0;
 
         dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
@@ -294,12 +358,8 @@ static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev)
             id == MC13783_REG_PWGT2SPI)
                 dis_val = mc13xxx_regulators[id].enable_bit;
 
-        mc13xxx_lock(priv->mc13xxx);
-        ret = mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit,
+        return mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit,
                                         dis_val);
-        mc13xxx_unlock(priv->mc13xxx);
-
-        return ret;
 }
 
 static int mc13783_gpo_regulator_is_enabled(struct regulator_dev *rdev)
@@ -330,7 +390,6 @@ static struct regulator_ops mc13783_gpo_regulator_ops = {
         .is_enabled = mc13783_gpo_regulator_is_enabled,
         .list_voltage = regulator_list_voltage_table,
         .set_voltage = mc13xxx_fixed_regulator_set_voltage,
-        .get_voltage = mc13xxx_fixed_regulator_get_voltage,
 };
 
 static int __devinit mc13783_regulator_probe(struct platform_device *pdev)