Unverified Commit 3e0569ff authored by Mark Brown's avatar Mark Brown
Browse files

regulator: Merge up pending fix 

One small fix didn't get sent before the merge window.
parents 804bf07a bc00d9f3

drivers/regulator/core.c

+3 −7
Original line number Diff line number Diff line
@@ -5542,6 +5542,8 @@ regulator_register(struct device *dev, 
		goto rinse;

	}

	device_initialize(&rdev->dev);

	dev_set_drvdata(&rdev->dev, rdev);

	rdev->dev.class = &regulator_class;

	spin_lock_init(&rdev->err_lock);



	/*
@@ -5603,11 +5605,9 @@ regulator_register(struct device *dev, 
		rdev->supply_name = regulator_desc->supply_name;



	/* register with sysfs */

	rdev->dev.class = &regulator_class;

	rdev->dev.parent = config->dev;

	dev_set_name(&rdev->dev, "regulator.%lu",

		    (unsigned long) atomic_inc_return(&regulator_no));

	dev_set_drvdata(&rdev->dev, rdev);



	/* set regulator constraints */

	if (init_data)
@@ -5724,15 +5724,11 @@ regulator_register(struct device *dev, 
	mutex_lock(&regulator_list_mutex);

	regulator_ena_gpio_free(rdev);

	mutex_unlock(&regulator_list_mutex);

	put_device(&rdev->dev);

	rdev = NULL;

clean:

	if (dangling_of_gpiod)

		gpiod_put(config->ena_gpiod);

	if (rdev && rdev->dev.of_node)

		of_node_put(rdev->dev.of_node);

	kfree(rdev);

	kfree(config);

	put_device(&rdev->dev);

rinse:

	if (dangling_cfg_gpiod)

		gpiod_put(cfg->ena_gpiod);

drivers/regulator/mt6358-regulator.c

+15 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct mt6358_regulator_info { 
		.name = #vreg,	\

		.supply_name = supply,		\

		.of_match = of_match_ptr(match),	\

		.ops = &mt6358_volt_range_ops,	\

		.ops = &mt6358_buck_ops,	\

		.type = REGULATOR_VOLTAGE,	\

		.id = MT6358_ID_##vreg,		\

		.owner = THIS_MODULE,		\
@@ -142,7 +142,7 @@ struct mt6358_regulator_info { 
		.name = #vreg,	\

		.supply_name = "vsys-" match,		\

		.of_match = of_match_ptr(match),	\

		.ops = &mt6358_volt_range_ops,	\

		.ops = &mt6358_buck_ops,	\

		.type = REGULATOR_VOLTAGE,	\

		.id = MT6366_ID_##vreg,		\

		.owner = THIS_MODULE,		\
@@ -449,7 +449,7 @@ static unsigned int mt6358_regulator_get_mode(struct regulator_dev *rdev) 
	}

}



static const struct regulator_ops mt6358_volt_range_ops = {

static const struct regulator_ops mt6358_buck_ops = {

	.list_voltage = regulator_list_voltage_linear,

	.map_voltage = regulator_map_voltage_linear,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,
@@ -463,6 +463,18 @@ static const struct regulator_ops mt6358_volt_range_ops = { 
	.get_mode = mt6358_regulator_get_mode,

};



static const struct regulator_ops mt6358_volt_range_ops = {

	.list_voltage = regulator_list_voltage_linear,

	.map_voltage = regulator_map_voltage_linear,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = mt6358_get_buck_voltage_sel,

	.set_voltage_time_sel = regulator_set_voltage_time_sel,

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,

	.get_status = mt6358_get_status,

};



static const struct regulator_ops mt6358_volt_table_ops = {

	.list_voltage = regulator_list_voltage_pickable_linear_range,

	.map_voltage = regulator_map_voltage_pickable_linear_range,

drivers/regulator/qcom-rpmh-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ static const struct rpmh_vreg_init_data pm8550ve_vreg_data[] = { 
	RPMH_VREG("smps1", "smp%s1", &pmic5_ftsmps525_lv, "vdd-s1"),

	RPMH_VREG("smps2", "smp%s2", &pmic5_ftsmps525_lv, "vdd-s2"),

	RPMH_VREG("smps3", "smp%s3", &pmic5_ftsmps525_lv, "vdd-s3"),

	RPMH_VREG("smps4", "smp%s4", &pmic5_ftsmps525_lv, "vdd-s4"),

	RPMH_VREG("smps4", "smp%s4", &pmic5_ftsmps525_mv, "vdd-s4"),

	RPMH_VREG("smps5", "smp%s5", &pmic5_ftsmps525_lv, "vdd-s5"),

	RPMH_VREG("smps6", "smp%s6", &pmic5_ftsmps525_lv, "vdd-s6"),

	RPMH_VREG("smps7", "smp%s7", &pmic5_ftsmps525_lv, "vdd-s7"),