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
Unified · Split
| @@ -53,7 +53,7 @@ · 52 unmodified lines | |||
| 53 | #define RTQ2208_MASK_BUCKPH_GROUP1 GENMASK(6, 4) | 53 | #define RTQ2208_MASK_BUCKPH_GROUP1 GENMASK(6, 4) |
| 54 | #define RTQ2208_MASK_BUCKPH_GROUP2 GENMASK(2, 0) | 54 | #define RTQ2208_MASK_BUCKPH_GROUP2 GENMASK(2, 0) |
| 55 | #define RTQ2208_MASK_LDO2_OPT0 BIT(7) | 55 | #define RTQ2208_MASK_LDO2_OPT0 BIT(7) |
| 56 | #define RTQ2208_MASK_LDO2_OPT1 BIT(6) | 56 | #define RTQ2208_MASK_LDO2_OPT1 BIT(7) |
| 57 | #define RTQ2208_MASK_LDO1_FIXED BIT(6) | 57 | #define RTQ2208_MASK_LDO1_FIXED BIT(6) |
| 58 | 58 | ||
| 59 | /* Size */ | 59 | /* Size */ |
| @@ -543,14 +543,14 @@ static int rtq2208_regulator_check(struct device *dev, int *num, int *regulator_ · 483 unmodified lines | |||
| 543 | 543 | ||
| 544 | switch (FIELD_GET(RTQ2208_MASK_BUCKPH_GROUP2, buck_phase)) { | 544 | switch (FIELD_GET(RTQ2208_MASK_BUCKPH_GROUP2, buck_phase)) { |
| 545 | case 2: | 545 | case 2: |
| 546 | rtq2208_used_table[RTQ2208_BUCK_F] = true; | 546 | rtq2208_used_table[RTQ2208_BUCK_H] = true; |
| 547 | fallthrough; | 547 | fallthrough; |
| 548 | case 1: | 548 | case 1: |
| 549 | rtq2208_used_table[RTQ2208_BUCK_E] = true; | 549 | rtq2208_used_table[RTQ2208_BUCK_E] = true; |
| 550 | fallthrough; | 550 | fallthrough; |
| 551 | case 0: | 551 | case 0: |
| 552 | case 3: | 552 | case 3: |
| 553 | rtq2208_used_table[RTQ2208_BUCK_H] = true; | 553 | rtq2208_used_table[RTQ2208_BUCK_F] = true; |
| 554 | fallthrough; | 554 | fallthrough; |
| 555 | default: | 555 | default: |
| 556 | rtq2208_used_table[RTQ2208_BUCK_G] = true; | 556 | rtq2208_used_table[RTQ2208_BUCK_G] = true; |