diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-30 10:58:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-30 10:58:28 -0700 |
| commit | 4f3730117f162b17147795eaad44421cc65178c7 (patch) | |
| tree | 580175d421f5afb451884285d23edfdeb160a702 /drivers/regulator | |
| parent | 2a44cdaa01837355b14b9221e87d75963846296c (diff) | |
| parent | aefe5fc3000a24869edbf7bb657adf28372ec158 (diff) | |
| download | linux-4f3730117f162b17147795eaad44421cc65178c7.tar.bz2 | |
Merge tag 'regulator-fix-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"A couple of fixes for the rt4831 driver which fix features that didn't
work due to incomplete description of the register configuration"
* tag 'regulator-fix-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: rt4831: Add active_discharge_on to fix discharge API
regulator: rt4831: Add bypass mask to fix set_bypass API work
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/rt4831-regulator.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/regulator/rt4831-regulator.c b/drivers/regulator/rt4831-regulator.c index 676b0419e48f..2016062cd7ef 100644 --- 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, } }; |