tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 82ebd4e3 9917bf8e

+3 -3
unified split
+3 -3
drivers/regulator/rtq2208-regulator.c
··· 53 #define RTQ2208_MASK_BUCKPH_GROUP1 GENMASK(6, 4) 54 #define RTQ2208_MASK_BUCKPH_GROUP2 GENMASK(2, 0) 55 #define RTQ2208_MASK_LDO2_OPT0 BIT(7) 56 - #define RTQ2208_MASK_LDO2_OPT1 BIT(6) 57 #define RTQ2208_MASK_LDO1_FIXED BIT(6) 58 59 /* Size */ ··· 543 544 switch (FIELD_GET(RTQ2208_MASK_BUCKPH_GROUP2, buck_phase)) { 545 case 2: 546 - rtq2208_used_table[RTQ2208_BUCK_F] = true; 547 fallthrough; 548 case 1: 549 rtq2208_used_table[RTQ2208_BUCK_E] = true; 550 fallthrough; 551 case 0: 552 case 3: 553 - rtq2208_used_table[RTQ2208_BUCK_H] = true; 554 fallthrough; 555 default: 556 rtq2208_used_table[RTQ2208_BUCK_G] = true;
··· 53 #define RTQ2208_MASK_BUCKPH_GROUP1 GENMASK(6, 4) 54 #define RTQ2208_MASK_BUCKPH_GROUP2 GENMASK(2, 0) 55 #define RTQ2208_MASK_LDO2_OPT0 BIT(7) 56 + #define RTQ2208_MASK_LDO2_OPT1 BIT(7) 57 #define RTQ2208_MASK_LDO1_FIXED BIT(6) 58 59 /* Size */ ··· 543 544 switch (FIELD_GET(RTQ2208_MASK_BUCKPH_GROUP2, buck_phase)) { 545 case 2: 546 + rtq2208_used_table[RTQ2208_BUCK_H] = true; 547 fallthrough; 548 case 1: 549 rtq2208_used_table[RTQ2208_BUCK_E] = true; 550 fallthrough; 551 case 0: 552 case 3: 553 + rtq2208_used_table[RTQ2208_BUCK_F] = true; 554 fallthrough; 555 default: 556 rtq2208_used_table[RTQ2208_BUCK_G] = true;