admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'regulator-fix-v6.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Browse Source 
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
This commit is contained in:
Linus Torvalds
2025-11-28 14:06:05 -08:00
parent 9917bf8e7f 8684229e19
commit 82ebd4e320
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/rtq2208-regulator.c
View File

@@ -53,7 +53,7 @@
#define RTQ2208_MASK_BUCKPH_GROUP1 GENMASK(6, 4) #define RTQ2208_MASK_BUCKPH_GROUP1 GENMASK(6, 4)
#define RTQ2208_MASK_BUCKPH_GROUP2 GENMASK(2, 0) #define RTQ2208_MASK_BUCKPH_GROUP2 GENMASK(2, 0)
#define RTQ2208_MASK_LDO2_OPT0 BIT(7) #define RTQ2208_MASK_LDO2_OPT0 BIT(7)
#define RTQ2208_MASK_LDO2_OPT1 BIT(6) #define RTQ2208_MASK_LDO2_OPT1 BIT(7)
#define RTQ2208_MASK_LDO1_FIXED BIT(6) #define RTQ2208_MASK_LDO1_FIXED BIT(6)
/* Size */ /* Size */
@@ -543,14 +543,14 @@ static int rtq2208_regulator_check(struct device *dev, int *num, int *regulator_
switch (FIELD_GET(RTQ2208_MASK_BUCKPH_GROUP2, buck_phase)) { switch (FIELD_GET(RTQ2208_MASK_BUCKPH_GROUP2, buck_phase)) {
case 2: case 2:
rtq2208_used_table[RTQ2208_BUCK_F] = true; rtq2208_used_table[RTQ2208_BUCK_H] = true;
fallthrough; fallthrough;
case 1: case 1:
rtq2208_used_table[RTQ2208_BUCK_E] = true; rtq2208_used_table[RTQ2208_BUCK_E] = true;
fallthrough; fallthrough;
case 0: case 0:
case 3: case 3:
rtq2208_used_table[RTQ2208_BUCK_H] = true; rtq2208_used_table[RTQ2208_BUCK_F] = true;
fallthrough; fallthrough;
default: default:
rtq2208_used_table[RTQ2208_BUCK_G] = true; rtq2208_used_table[RTQ2208_BUCK_G] = true;