Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
+3
drivers/regulator/rt4831-regulator.c
+3
drivers/regulator/rt4831-regulator.c
···
106
106
.vsel_reg = RT4831_REG_VLCM,
107
107
.vsel_mask = RT4831_VOLT_MASK,
108
108
.bypass_reg = RT4831_REG_DSVEN,
109
+
.bypass_mask = RT4831_DSVMODE_MASK,
109
110
.bypass_val_on = DSV_MODE_BYPASS,
110
111
.bypass_val_off = DSV_MODE_NORMAL,
111
112
.owner = THIS_MODULE,
···
127
126
.enable_mask = RT4831_POSEN_MASK,
128
127
.active_discharge_reg = RT4831_REG_DSVEN,
129
128
.active_discharge_mask = RT4831_POSADEN_MASK,
129
+
.active_discharge_on = RT4831_POSADEN_MASK,
130
130
.owner = THIS_MODULE,
131
131
},
132
132
{
···
146
144
.enable_mask = RT4831_NEGEN_MASK,
147
145
.active_discharge_reg = RT4831_REG_DSVEN,
148
146
.active_discharge_mask = RT4831_NEGADEN_MASK,
147
+
.active_discharge_on = RT4831_NEGADEN_MASK,
149
148
.owner = THIS_MODULE,
150
149
}
151
150
};