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

Commit 1474e4db authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regulator-register' into regulator-drivers

parents f604c10c 09de3473

drivers/regulator/ad5398.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static struct regulator_ops ad5398_ops = { 
	.is_enabled = ad5398_is_enabled,

};



static struct regulator_desc ad5398_reg = {

static const struct regulator_desc ad5398_reg = {

	.name = "isink",

	.id = 0,

	.ops = &ad5398_ops,

drivers/regulator/core.c

+2 −1
Original line number Diff line number Diff line
@@ -2829,7 +2829,8 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) 
 * Called by regulator drivers to register a regulator.

 * Returns 0 on success.

 */

struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,

struct regulator_dev *

regulator_register(const struct regulator_desc *regulator_desc,

	struct device *dev, const struct regulator_init_data *init_data,

	void *driver_data, struct device_node *of_node)

{

drivers/regulator/isl6271a-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static struct regulator_ops isl_fixed_ops = { 
	.list_voltage	= isl6271a_list_fixed_voltage,

};



static struct regulator_desc isl_rd[] = {

static const struct regulator_desc isl_rd[] = {

	{

		.name		= "Core Buck",

		.id		= 0,

drivers/regulator/lp3971.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static struct regulator_ops lp3971_dcdc_ops = { 
	.set_voltage_sel = lp3971_dcdc_set_voltage_sel,

};



static struct regulator_desc regulators[] = {

static const struct regulator_desc regulators[] = {

	{

		.name = "LDO1",

		.id = LP3971_LDO1,

drivers/regulator/lp3972.c

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static struct regulator_ops lp3972_dcdc_ops = { 
	.set_voltage_sel = lp3972_dcdc_set_voltage_sel,

};



static struct regulator_desc regulators[] = {

static const struct regulator_desc regulators[] = {

	{

		.name = "LDO1",

		.id = LP3972_LDO1,