Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9950756d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/act8865',... 

Merge remote-tracking branches 'regulator/fix/act8865', 'regulator/fix/arizona' and 'regulator/fix/tps65218' into regulator-linus
parents 19583ca5 732714d0 5b919f3e 42ab0f39

drivers/regulator/act8865-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int act8865_pdata_from_dt(struct device *dev, 
	if (!pdata->regulators)

		return -ENOMEM;



	pdata->num_regulators = matched;

	pdata->num_regulators = ARRAY_SIZE(act8865_matches);

	regulator = pdata->regulators;



	for (i = 0; i < ARRAY_SIZE(act8865_matches); i++) {

drivers/regulator/arizona-ldo1.c

+0 −2
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ static struct regulator_ops arizona_ldo1_ops = { 
	.map_voltage = regulator_map_voltage_linear,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_bypass = regulator_get_bypass_regmap,

	.set_bypass = regulator_set_bypass_regmap,

};



static const struct regulator_desc arizona_ldo1 = {

drivers/regulator/tps65218-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static const struct regulator_linear_range ldo1_dcdc3_ranges[] = { 


static const struct regulator_linear_range dcdc4_ranges[] = {

	REGULATOR_LINEAR_RANGE(1175000, 0x0, 0xf, 25000),

	REGULATOR_LINEAR_RANGE(1550000, 0x10, 0x34, 50000),

	REGULATOR_LINEAR_RANGE(1600000, 0x10, 0x34, 50000),

};



static struct tps_info tps65218_pmic_regs[] = {