diff options
Diffstat (limited to 'drivers/regulator/bd71837-regulator.c')
| -rw-r--r-- | drivers/regulator/bd71837-regulator.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/drivers/regulator/bd71837-regulator.c b/drivers/regulator/bd71837-regulator.c index e6351e66fdba..9fb8cf75824f 100644 --- a/drivers/regulator/bd71837-regulator.c +++ b/drivers/regulator/bd71837-regulator.c @@ -238,9 +238,8 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_BUCK1_VOLT_RUN, .vsel_mask = BUCK1_RUN_MASK, .enable_reg = BD71837_REG_BUCK1_CTRL, - .enable_mask = BUCK1_SEL|BUCK1_EN, - .disable_val = BUCK1_SEL, - .enable_val = BUCK1_SEL|BUCK1_EN, + .enable_mask = BUCK1_SEL, + .enable_is_inverted = 1, .enable_time = 500, .owner = THIS_MODULE, }, @@ -255,9 +254,8 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_BUCK2_VOLT_RUN, .vsel_mask = BUCK2_RUN_MASK, .enable_reg = BD71837_REG_BUCK2_CTRL, - .enable_mask = BUCK2_SEL|BUCK2_EN, - .disable_val = BUCK2_SEL, - .enable_val = BUCK2_SEL|BUCK2_EN, + .enable_mask = BUCK2_SEL, + .enable_is_inverted = 1, .enable_time = 500, .owner = THIS_MODULE, }, @@ -272,9 +270,8 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_BUCK3_VOLT_RUN, .vsel_mask = BUCK3_RUN_MASK, .enable_reg = BD71837_REG_BUCK3_CTRL, - .enable_mask = BUCK3_SEL|BUCK3_EN, - .disable_val = BUCK3_SEL, - .enable_val = BUCK3_SEL|BUCK3_EN, + .enable_mask = BUCK3_SEL, + .enable_is_inverted = 1, .enable_time = 500, .owner = THIS_MODULE, }, @@ -289,10 +286,9 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_BUCK4_VOLT_RUN, .vsel_mask = BUCK4_RUN_MASK, .enable_reg = BD71837_REG_BUCK4_CTRL, - .enable_mask = BUCK4_SEL|BUCK4_EN, + .enable_mask = BUCK4_SEL, + .enable_is_inverted = 1, .enable_time = 500, - .disable_val = BUCK4_SEL, - .enable_val = BUCK4_SEL|BUCK4_EN, .owner = THIS_MODULE, }, { @@ -306,7 +302,8 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_BUCK5_VOLT, .vsel_mask = BUCK5_MASK, .enable_reg = BD71837_REG_BUCK5_CTRL, - .enable_mask = BUCK5_SEL|BUCK5_EN, + .enable_mask = BUCK5_SEL, + .enable_is_inverted = 1, .owner = THIS_MODULE, }, { @@ -320,7 +317,8 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_BUCK6_VOLT, .vsel_mask = BUCK6_MASK, .enable_reg = BD71837_REG_BUCK6_CTRL, - .enable_mask = BUCK6_SEL|BUCK6_EN, + .enable_mask = BUCK6_SEL, + .enable_is_inverted = 1, .owner = THIS_MODULE, }, { @@ -334,7 +332,8 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_BUCK7_VOLT, .vsel_mask = BUCK7_MASK, .enable_reg = BD71837_REG_BUCK7_CTRL, - .enable_mask = BUCK7_SEL|BUCK7_EN, + .enable_mask = BUCK7_SEL, + .enable_is_inverted = 1, .owner = THIS_MODULE, }, { @@ -348,7 +347,8 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_BUCK8_VOLT, .vsel_mask = BUCK8_MASK, .enable_reg = BD71837_REG_BUCK8_CTRL, - .enable_mask = BUCK8_SEL|BUCK8_EN, + .enable_mask = BUCK8_SEL, + .enable_is_inverted = 1, .owner = THIS_MODULE, }, { @@ -362,7 +362,8 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_LDO1_VOLT, .vsel_mask = LDO1_MASK, .enable_reg = BD71837_REG_LDO1_VOLT, - .enable_mask = LDO1_SEL|LDO1_EN, + .enable_mask = LDO1_SEL, + .enable_is_inverted = 1, .owner = THIS_MODULE, }, /* @@ -377,7 +378,8 @@ static const struct regulator_desc bd71837_regulators[] = { .n_voltages = BD71837_LDO2_VOLTAGE_NUM, .min_uV = 900000, .enable_reg = BD71837_REG_LDO2_VOLT, - .enable_mask = LDO2_SEL|LDO2_EN, + .enable_mask = LDO2_SEL, + .enable_is_inverted = 1, .owner = THIS_MODULE, }, { @@ -391,7 +393,8 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_LDO3_VOLT, .vsel_mask = LDO3_MASK, .enable_reg = BD71837_REG_LDO3_VOLT, - .enable_mask = LDO3_SEL|LDO3_EN, + .enable_mask = LDO3_SEL, + .enable_is_inverted = 1, .owner = THIS_MODULE, }, { @@ -405,7 +408,8 @@ static const struct regulator_desc bd71837_regulators[] = { .vsel_reg = BD71837_REG_LDO4_VOLT, .vsel_mask = LDO4_MASK, .enable_reg = BD71837_REG_LDO4_VOLT, - .enable_mask = LDO4_SEL|LDO4_EN, + .enable_mask = LDO4_SEL, + .enable_is_inverted = 1, .owner = THIS_MODULE, }, { |