Commit 82ebd4e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.18-rc7' of... 

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
parents 9917bf8e 8684229e

drivers/regulator/rtq2208-regulator.c

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#define RTQ2208_MASK_BUCKPH_GROUP1		GENMASK(6, 4)

#define RTQ2208_MASK_BUCKPH_GROUP2		GENMASK(2, 0)

#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)



/* 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)) {

	case 2:

		rtq2208_used_table[RTQ2208_BUCK_F] = true;

		rtq2208_used_table[RTQ2208_BUCK_H] = true;

		fallthrough;

	case 1:

		rtq2208_used_table[RTQ2208_BUCK_E] = true;

		fallthrough;

	case 0:

	case 3:

		rtq2208_used_table[RTQ2208_BUCK_H] = true;

		rtq2208_used_table[RTQ2208_BUCK_F] = true;

		fallthrough;

	default:

		rtq2208_used_table[RTQ2208_BUCK_G] = true;