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

Commit c9ac0659 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/as3722', 'regulator/fix/ltc3589'... 

Merge remote-tracking branches 'regulator/fix/as3722', 'regulator/fix/ltc3589' and 'regulator/fix/palmas' into regulator-linus
parents c3313b0c 2050afde 73d23ca7 6b7f2d82

drivers/regulator/as3722-regulator.c

+2 −0
Original line number Diff line number Diff line
@@ -433,6 +433,7 @@ static struct regulator_ops as3722_ldo3_extcntrl_ops = { 
};



static const struct regulator_linear_range as3722_ldo_ranges[] = {

	REGULATOR_LINEAR_RANGE(0, 0x00, 0x00, 0),

	REGULATOR_LINEAR_RANGE(825000, 0x01, 0x24, 25000),

	REGULATOR_LINEAR_RANGE(1725000, 0x40, 0x7F, 25000),

};
@@ -609,6 +610,7 @@ static bool as3722_sd0_is_low_voltage(struct as3722_regulators *as3722_regs) 
}



static const struct regulator_linear_range as3722_sd2345_ranges[] = {

	REGULATOR_LINEAR_RANGE(0, 0x00, 0x00, 0),

	REGULATOR_LINEAR_RANGE(612500, 0x01, 0x40, 12500),

	REGULATOR_LINEAR_RANGE(1425000, 0x41, 0x70, 25000),

	REGULATOR_LINEAR_RANGE(2650000, 0x71, 0x7F, 50000),

drivers/regulator/ltc3589.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static int ltc3589_parse_regulators_dt(struct ltc3589 *ltc3589) 
	struct device_node *node;

	int i, ret;



	node = of_find_node_by_name(dev->of_node, "regulators");

	node = of_get_child_by_name(dev->of_node, "regulators");

	if (!node) {

		dev_err(dev, "regulators node not found\n");

		return -EINVAL;

drivers/regulator/palmas-regulator.c

+2 −0
Original line number Diff line number Diff line
@@ -37,12 +37,14 @@ struct regs_info { 
};



static const struct regulator_linear_range smps_low_ranges[] = {

	REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),

	REGULATOR_LINEAR_RANGE(500000, 0x1, 0x6, 0),

	REGULATOR_LINEAR_RANGE(510000, 0x7, 0x79, 10000),

	REGULATOR_LINEAR_RANGE(1650000, 0x7A, 0x7f, 0),

};



static const struct regulator_linear_range smps_high_ranges[] = {

	REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),

	REGULATOR_LINEAR_RANGE(1000000, 0x1, 0x6, 0),

	REGULATOR_LINEAR_RANGE(1020000, 0x7, 0x79, 20000),

	REGULATOR_LINEAR_RANGE(3300000, 0x7A, 0x7f, 0),