[PATCH 0/2] Fix rt4831 regulator active_discharge and bypass

[PATCH 0/2] Fix rt4831 regulator active_discharge and bypass

[cy_huang]

From: ChiYuan Huang <cy_huang@richtek.com>

This patch series is to fix rt4831 regulator set/get active_discharge and bypass

ChiYuan Huang (2):
  regulator: rt4831: Add bypass mask to fix set_bypass API work
  regulator: rt4831: Add active_discharge_on to fix discharge API

 drivers/regulator/rt4831-regulator.c | 3 +++
 1 file changed, 3 insertions(+)

-- 
2.7.4

[PATCH 1/2] regulator: rt4831: Add bypass mask to fix set_bypass API work

[cy_huang]

From: ChiYuan Huang <cy_huang@richtek.com>

To use set/get_bypass helper function, bypass mask need to be specified.

Signed-off-by: ChiYuan Huang <cy_huang@richtek.com>
---
 drivers/regulator/rt4831-regulator.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/regulator/rt4831-regulator.c b/drivers/regulator/rt4831-regulator.c
index 676b041..8d24b5f 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,
-- 
2.7.4

[PATCH 2/2] regulator: rt4831: Add active_discharge_on to fix discharge API

[cy_huang]

From: ChiYuan Huang <cy_huang@richtek.com>

To use set_discharge helper function, active_discharge_on need to be
added.

Signed-off-by: ChiYuan Huang <cy_huang@richtek.com>
---
 drivers/regulator/rt4831-regulator.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/regulator/rt4831-regulator.c b/drivers/regulator/rt4831-regulator.c
index 8d24b5f..2016062 100644
--- a/drivers/regulator/rt4831-regulator.c
+++ b/drivers/regulator/rt4831-regulator.c
@@ -127,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,
 	},
 	{
@@ -145,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,
 	}
 };
-- 
2.7.4

Re: [PATCH 0/2] Fix rt4831 regulator active_discharge and bypass

[Mark Brown]

On Fri, 25 Mar 2022 09:26:15 +0800, cy_huang wrote:
> From: ChiYuan Huang <cy_huang@richtek.com>
> 
> This patch series is to fix rt4831 regulator set/get active_discharge and bypass
> 
> ChiYuan Huang (2):
>   regulator: rt4831: Add bypass mask to fix set_bypass API work
>   regulator: rt4831: Add active_discharge_on to fix discharge API
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-linus

Thanks!

[1/2] regulator: rt4831: Add bypass mask to fix set_bypass API work
      commit: 184ae0e32bc990bba203b60503df89c9f8865f13
[2/2] regulator: rt4831: Add active_discharge_on to fix discharge API
      commit: aefe5fc3000a24869edbf7bb657adf28372ec158

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark