Commit 4f373011 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2a44cdaa aefe5fc3

drivers/regulator/rt4831-regulator.c

+3 −0
Original line number Diff line number Diff line
@@ -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,

	}

};