Commit 7b85bb4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.12-rc6' of... 

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

Pull regulator fixes from Mark Brown:
 "A couple of small fixes for drivers, nothing particularly remarkable"

* tag 'regulator-fix-v6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: rk808: Add apply_bit for BUCK3 on RK809
  regulator: rtq2208: Fix uninitialized use of regulator_config
parents bfc64d9b 5e53e4a6

drivers/regulator/rk808-regulator.c

+2 −0
Original line number Diff line number Diff line
@@ -1379,6 +1379,8 @@ static const struct regulator_desc rk809_reg[] = { 
		.n_linear_ranges = ARRAY_SIZE(rk817_buck1_voltage_ranges),

		.vsel_reg = RK817_BUCK3_ON_VSEL_REG,

		.vsel_mask = RK817_BUCK_VSEL_MASK,

		.apply_reg = RK817_POWER_CONFIG,

		.apply_bit = RK817_BUCK3_FB_RES_INTER,

		.enable_reg = RK817_POWER_EN_REG(0),

		.enable_mask = ENABLE_MASK(RK817_ID_DCDC3),

		.enable_val = ENABLE_MASK(RK817_ID_DCDC3),

drivers/regulator/rtq2208-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ static int rtq2208_probe(struct i2c_client *i2c) 
	struct regmap *regmap;

	struct rtq2208_regulator_desc *rdesc[RTQ2208_LDO_MAX];

	struct regulator_dev *rdev;

	struct regulator_config cfg;

	struct regulator_config cfg = {};

	struct rtq2208_rdev_map *rdev_map;

	int i, ret = 0, idx, n_regulator = 0;

	unsigned int regulator_idx_table[RTQ2208_LDO_MAX],