Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

[linux-2.6-microblaze.git] / drivers / regulator / rt4831-regulator.c

diff --git a/drivers/regulator/rt4831-regulator.c b/drivers/regulator/rt4831-regulator.c
index 676b041..2016062 100644 (file)
--- a/drivers/regulator/rt4831-regulator.c
+++ b/drivers/regulator/rt4831-regulator.c
@@ -106,6 +106,7 @@ static const struct regulator_desc rt4831_regulator_descs[] = {
                .vsel_reg = RT4831_REG_VLCM,
                .vsel_mask = RT4831_VOLT_MASK,
                .bypass_reg = RT4831_REG_DSVEN,
+               .bypass_mask = RT4831_DSVMODE_MASK,
                .bypass_val_on = DSV_MODE_BYPASS,
                .bypass_val_off = DSV_MODE_NORMAL,
                .owner = THIS_MODULE,
@@ -126,6 +127,7 @@ static const struct regulator_desc rt4831_regulator_descs[] = {
                .enable_mask = RT4831_POSEN_MASK,
                .active_discharge_reg = RT4831_REG_DSVEN,
                .active_discharge_mask = RT4831_POSADEN_MASK,
+               .active_discharge_on = RT4831_POSADEN_MASK,
                .owner = THIS_MODULE,
        },
        {
@@ -144,6 +146,7 @@ static const struct regulator_desc rt4831_regulator_descs[] = {
                .enable_mask = RT4831_NEGEN_MASK,
                .active_discharge_reg = RT4831_REG_DSVEN,
                .active_discharge_mask = RT4831_NEGADEN_MASK,
+               .active_discharge_on = RT4831_NEGADEN_MASK,
                .owner = THIS_MODULE,
        }
 };