regulator: tps65910: Simplify setting enable_mask for regulators

BBCH_BBCHEN_MASK is equivalent to TPS65910_SUPPLY_STATE_ENABLED.
So all regulators have the same enable_mask setting.

BBCH_BBCHEN_MASK and BBCH_BBCHEN_SHIFT are not used now, remove them.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

2 files changed, 1 insertions, 17 deletions

diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 979ea0a99a79..f50dd847eebc 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -1207,21 +1207,7 @@ static int tps65910_probe(struct platform_device *pdev)
                 pmic->desc[i].type = REGULATOR_VOLTAGE;
                 pmic->desc[i].owner = THIS_MODULE;
                 pmic->desc[i].enable_reg = pmic->get_ctrl_reg(i);
-
-                switch (i) {
-                case TPS65910_REG_VBB:
-                        if (tps65910_chip_id(tps65910) == TPS65910)
-                                pmic->desc[i].enable_mask = BBCH_BBCHEN_MASK;
-                        else
-                                pmic->desc[i].enable_mask =
-                                        TPS65910_SUPPLY_STATE_ENABLED;
-                        break;
-
-                default:
-                        pmic->desc[i].enable_mask =
-                                TPS65910_SUPPLY_STATE_ENABLED;
-                        break;
-                }
+                pmic->desc[i].enable_mask = TPS65910_SUPPLY_STATE_ENABLED;
 
                 config.dev = tps65910->dev;
                 config.init_data = reg_data;
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h
index 1adeee186194..16c2335c2856 100644
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@ -358,8 +358,6 @@
 /*Register BBCH  (0x80) register.RegisterDescription */
 #define BBCH_BBSEL_MASK                                 0x06
 #define BBCH_BBSEL_SHIFT                                1
-#define BBCH_BBCHEN_MASK                                0x01
-#define BBCH_BBCHEN_SHIFT                               0
 
 
 /*Register DCDCCTRL  (0x80) register.RegisterDescription */