2021-05-17 02:00:22

by Axel Lin

Subject: [PATCH 1/2] regulator: fan53555: Fix slew_shift setting for tcs4525

Fix trivial copy-paste mistake.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/fan53555.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index 2695be617373..d582ef3a3aeb 100644
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -376,7 +376,7 @@ static int fan53526_voltages_setup_tcs(struct fan53555_device_info *di)
case TCS4525_CHIP_ID_12:
di->slew_reg = TCS4525_TIME;
di->slew_mask = TCS_SLEW_MASK;
- di->slew_shift = TCS_SLEW_MASK;
+ di->slew_shift = TCS_SLEW_SHIFT;

/* Init voltage range and step */
di->vsel_min = 600000;
--
2.25.1

2021-05-17 02:00:54

by Axel Lin

Subject: [PATCH 2/2] regulator: fan53555: Cleanup unused define and redundant assignment

TCS_VSEL_NSEL_MASK is not used so remove it.
Also remove redundant assignment for di->slew_reg.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/fan53555.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index d582ef3a3aeb..f3f49cf3731b 100644
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -56,7 +56,6 @@
#define FAN53555_NVOLTAGES 64 /* Numbers of voltages */
#define FAN53526_NVOLTAGES 128

-#define TCS_VSEL_NSEL_MASK 0x7f
#define TCS_VSEL0_MODE (1 << 7)
#define TCS_VSEL1_MODE (1 << 6)

@@ -362,7 +361,6 @@ static int fan53555_voltages_setup_silergy(struct fan53555_device_info *di)
return -EINVAL;
}
di->slew_reg = FAN53555_CONTROL;
- di->slew_reg = FAN53555_CONTROL;
di->slew_mask = CTL_SLEW_MASK;
di->slew_shift = CTL_SLEW_SHIFT;
di->vsel_count = FAN53555_NVOLTAGES;
--
2.25.1

2021-05-19 20:14:49

by Mark Brown

Subject: Re: [PATCH 1/2] regulator: fan53555: Fix slew_shift setting for tcs4525

On Mon, 17 May 2021 09:03:17 +0800, Axel Lin wrote:
> Fix trivial copy-paste mistake.

Applied to

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

Thanks!

[1/2] regulator: fan53555: Fix slew_shift setting for tcs4525
commit: a7f003147b785d9780ceeac13a8e344927a3b9ea
[2/2] regulator: fan53555: Cleanup unused define and redundant assignment
commit: 79c7e1447c1c998e2571191e3cad12f9285ee22e

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