Merge remote-tracking branch 'regulator/topic/axp20x' into regulator-next

[sfrench/cifs-2.6.git] / drivers / regulator / axp20x-regulator.c

diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index e1761df4cbfddbcf69293562dd71e7b52ddbb9ee..181622b2813d94a963031f31c246944a52c881fb 100644 (file)
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -657,6 +657,7 @@ static bool axp20x_is_polyphase_slave(struct axp20x_dev *axp20x, int id)
         */
        switch (axp20x->variant) {
        case AXP803_ID:
+       case AXP813_ID:
                regmap_read(axp20x->regmap, AXP803_POLYPHASE_CTRL, &reg);
 
                switch (id) {
@@ -681,17 +682,6 @@ static bool axp20x_is_polyphase_slave(struct axp20x_dev *axp20x, int id)
                }
                break;
 
-       case AXP813_ID:
-               regmap_read(axp20x->regmap, AXP803_POLYPHASE_CTRL, &reg);
-
-               switch (id) {
-               case AXP803_DCDC3:
-                       return !!(reg & BIT(6));
-               case AXP803_DCDC6:
-                       return !!(reg & BIT(5));
-               }
-               break;
-
        default:
                return false;
        }