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

Commit 0fe3f971 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/debugfs' and... 

Merge remote-tracking branches 'regulator/fix/debugfs' and 'regulator/fix/tps65086' into regulator-linus
parents 1c35539c e42a46b6 6308f178

drivers/regulator/core.c

+3 −2
Original line number Diff line number Diff line
@@ -4391,12 +4391,13 @@ static void regulator_summary_show_subtree(struct seq_file *s, 
	seq_puts(s, "\n");



	list_for_each_entry(consumer, &rdev->consumer_list, list) {

		if (consumer->dev->class == &regulator_class)

		if (consumer->dev && consumer->dev->class == &regulator_class)

			continue;



		seq_printf(s, "%*s%-*s ",

			   (level + 1) * 3 + 1, "",

			   30 - (level + 1) * 3, dev_name(consumer->dev));

			   30 - (level + 1) * 3,

			   consumer->dev ? dev_name(consumer->dev) : "deviceless");



		switch (rdev->desc->type) {

		case REGULATOR_VOLTAGE:

drivers/regulator/tps65086-regulator.c

+5 −5
Original line number Diff line number Diff line
@@ -157,19 +157,19 @@ static struct tps65086_regulator regulators[] = { 
			   VDOA23_VID_MASK, TPS65086_LDOA3CTRL, BIT(0),

			   tps65086_ldoa23_ranges, 0, 0),

	TPS65086_SWITCH("SWA1", "swa1", SWA1, TPS65086_SWVTT_EN, BIT(5)),

	TPS65086_SWITCH("SWB1", "swa2", SWB1, TPS65086_SWVTT_EN, BIT(6)),

	TPS65086_SWITCH("SWB2", "swa3", SWB2, TPS65086_SWVTT_EN, BIT(7)),

	TPS65086_SWITCH("SWB1", "swb1", SWB1, TPS65086_SWVTT_EN, BIT(6)),

	TPS65086_SWITCH("SWB2", "swb2", SWB2, TPS65086_SWVTT_EN, BIT(7)),

	TPS65086_SWITCH("VTT", "vtt", VTT, TPS65086_SWVTT_EN, BIT(4)),

};



static int tps65086_of_parse_cb(struct device_node *dev,

static int tps65086_of_parse_cb(struct device_node *node,

				const struct regulator_desc *desc,

				struct regulator_config *config)

{

	int ret;



	/* Check for 25mV step mode */

	if (of_property_read_bool(config->of_node, "ti,regulator-step-size-25mv")) {

	if (of_property_read_bool(node, "ti,regulator-step-size-25mv")) {

		switch (desc->id) {

		case BUCK1:

		case BUCK2:
@@ -193,7 +193,7 @@ static int tps65086_of_parse_cb(struct device_node *dev, 
	}



	/* Check for decay mode */

	if (desc->id <= BUCK6 && of_property_read_bool(config->of_node, "ti,regulator-decay")) {

	if (desc->id <= BUCK6 && of_property_read_bool(node, "ti,regulator-decay")) {

		ret = regmap_write_bits(config->regmap,

					regulators[desc->id].decay_reg,

					regulators[desc->id].decay_mask,