Skip to content

Commit 82ebd4e

Browse files
committed
Merge tag 'regulator-fix-v6.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "A couple of fixes for incorrect device descriptions in the rtq2208 driver" * tag 'regulator-fix-v6.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: rtq2208: Correct LDO2 logic judgment bits regulator: rtq2208: Correct buck group2 phase mapping logic
2 parents 9917bf8 + 8684229 commit 82ebd4e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/regulator/rtq2208-regulator.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#define RTQ2208_MASK_BUCKPH_GROUP1 GENMASK(6, 4)
5454
#define RTQ2208_MASK_BUCKPH_GROUP2 GENMASK(2, 0)
5555
#define RTQ2208_MASK_LDO2_OPT0 BIT(7)
56-
#define RTQ2208_MASK_LDO2_OPT1 BIT(6)
56+
#define RTQ2208_MASK_LDO2_OPT1 BIT(7)
5757
#define RTQ2208_MASK_LDO1_FIXED BIT(6)
5858

5959
/* Size */
@@ -543,14 +543,14 @@ static int rtq2208_regulator_check(struct device *dev, int *num, int *regulator_
543543

544544
switch (FIELD_GET(RTQ2208_MASK_BUCKPH_GROUP2, buck_phase)) {
545545
case 2:
546-
rtq2208_used_table[RTQ2208_BUCK_F] = true;
546+
rtq2208_used_table[RTQ2208_BUCK_H] = true;
547547
fallthrough;
548548
case 1:
549549
rtq2208_used_table[RTQ2208_BUCK_E] = true;
550550
fallthrough;
551551
case 0:
552552
case 3:
553-
rtq2208_used_table[RTQ2208_BUCK_H] = true;
553+
rtq2208_used_table[RTQ2208_BUCK_F] = true;
554554
fallthrough;
555555
default:
556556
rtq2208_used_table[RTQ2208_BUCK_G] = true;

0 commit comments

Comments
 (0)