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

Unverified Commit c7b5128f authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regulator-5.1' into regulator-linus

parents e93c9c99 734008e7

drivers/regulator/core.c

+7 −8
Original line number Diff line number Diff line
@@ -2256,6 +2256,7 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev) 
		if (pin->gpiod == rdev->ena_pin->gpiod) {

			if (pin->request_count <= 1) {

				pin->request_count = 0;

				gpiod_put(pin->gpiod);

				list_del(&pin->list);

				kfree(pin);

				rdev->ena_pin = NULL;
@@ -3322,15 +3323,12 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, 


	/* for not coupled regulators this will just set the voltage */

	ret = regulator_balance_voltage(rdev, state);

	if (ret < 0)

		goto out2;



out:

	return 0;

out2:

	if (ret < 0) {

		voltage->min_uV = old_min_uV;

		voltage->max_uV = old_max_uV;

	}



out:

	return ret;

}
@@ -5064,10 +5062,11 @@ void regulator_unregister(struct regulator_dev *rdev) 
		regulator_put(rdev->supply);

	}



	flush_work(&rdev->disable_work.work);



	mutex_lock(&regulator_list_mutex);



	debugfs_remove_recursive(rdev->debugfs);

	flush_work(&rdev->disable_work.work);

	WARN_ON(rdev->open_count);

	regulator_remove_coupling(rdev);

	unset_regulator_supplies(rdev);

drivers/regulator/max77620-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static int max77620_regulator_probe(struct platform_device *pdev) 
			continue;



		rdesc = &rinfo[id].desc;

		pmic->rinfo[id] = &max77620_regs_info[id];

		pmic->rinfo[id] = &rinfo[id];

		pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL;

		pmic->reg_pdata[id].active_fps_src = -1;

		pmic->reg_pdata[id].active_fps_pd_slot = -1;

drivers/regulator/tps65217-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static const struct regulator_linear_range tps65217_uv1_ranges[] = { 
	REGULATOR_LINEAR_RANGE(1550000, 25, 30, 50000),

	REGULATOR_LINEAR_RANGE(1850000, 31, 52, 50000),

	REGULATOR_LINEAR_RANGE(3000000, 53, 55, 100000),

	REGULATOR_LINEAR_RANGE(3300000, 56, 62, 0),

	REGULATOR_LINEAR_RANGE(3300000, 56, 63, 0),

};



static const struct regulator_linear_range tps65217_uv2_ranges[] = {