Skip to content

Commit 7b85bb4

Browse files
committed
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
2 parents bfc64d9 + 5e53e4a commit 7b85bb4

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

drivers/regulator/rk808-regulator.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,6 +1379,8 @@ static const struct regulator_desc rk809_reg[] = {
13791379
.n_linear_ranges = ARRAY_SIZE(rk817_buck1_voltage_ranges),
13801380
.vsel_reg = RK817_BUCK3_ON_VSEL_REG,
13811381
.vsel_mask = RK817_BUCK_VSEL_MASK,
1382+
.apply_reg = RK817_POWER_CONFIG,
1383+
.apply_bit = RK817_BUCK3_FB_RES_INTER,
13821384
.enable_reg = RK817_POWER_EN_REG(0),
13831385
.enable_mask = ENABLE_MASK(RK817_ID_DCDC3),
13841386
.enable_val = ENABLE_MASK(RK817_ID_DCDC3),

drivers/regulator/rtq2208-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ static int rtq2208_probe(struct i2c_client *i2c)
568568
struct regmap *regmap;
569569
struct rtq2208_regulator_desc *rdesc[RTQ2208_LDO_MAX];
570570
struct regulator_dev *rdev;
571-
struct regulator_config cfg;
571+
struct regulator_config cfg = {};
572572
struct rtq2208_rdev_map *rdev_map;
573573
int i, ret = 0, idx, n_regulator = 0;
574574
unsigned int regulator_idx_table[RTQ2208_LDO_MAX],

0 commit comments

Comments
 (0)