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

Commit 56590d75 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/pbias',... 

Merge remote-tracking branches 'regulator/topic/pbias', 'regulator/topic/pcap', 'regulator/topic/pcf50633', 'regulator/topic/pfuze100' and 'regulator/topic/pv88060' into regulator-next
parents cecc2795 a180df71 00804e6a 0be79431 e5053853 ea51874c

drivers/regulator/pbias-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static const unsigned int pbias_volt_table[] = { 
	3000000

};



static struct regulator_ops pbias_regulator_voltage_ops = {

static const struct regulator_ops pbias_regulator_voltage_ops = {

	.list_voltage = regulator_list_voltage_table,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

drivers/regulator/pcap-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int pcap_regulator_is_enabled(struct regulator_dev *rdev) 
	return (tmp >> vreg->en) & 1;

}



static struct regulator_ops pcap_regulator_ops = {

static const struct regulator_ops pcap_regulator_ops = {

	.list_voltage	= regulator_list_voltage_table,

	.set_voltage_sel = pcap_regulator_set_voltage_sel,

	.get_voltage_sel = pcap_regulator_get_voltage_sel,

drivers/regulator/pcf50633-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
		.enable_mask = PCF50633_REGULATOR_ON,		\

	}



static struct regulator_ops pcf50633_regulator_ops = {

static const struct regulator_ops pcf50633_regulator_ops = {

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.list_voltage = regulator_list_voltage_linear,

drivers/regulator/pfuze100-regulator.c

+4 −4
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int pfuze100_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) 
	return ret;

}



static struct regulator_ops pfuze100_ldo_regulator_ops = {

static const struct regulator_ops pfuze100_ldo_regulator_ops = {

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,
@@ -135,14 +135,14 @@ static struct regulator_ops pfuze100_ldo_regulator_ops = { 
	.get_voltage_sel = regulator_get_voltage_sel_regmap,

};



static struct regulator_ops pfuze100_fixed_regulator_ops = {

static const struct regulator_ops pfuze100_fixed_regulator_ops = {

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,

	.list_voltage = regulator_list_voltage_linear,

};



static struct regulator_ops pfuze100_sw_regulator_ops = {

static const struct regulator_ops pfuze100_sw_regulator_ops = {

	.list_voltage = regulator_list_voltage_linear,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,
@@ -150,7 +150,7 @@ static struct regulator_ops pfuze100_sw_regulator_ops = { 
	.set_ramp_delay = pfuze100_set_ramp_delay,

};



static struct regulator_ops pfuze100_swb_regulator_ops = {

static const struct regulator_ops pfuze100_swb_regulator_ops = {

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.list_voltage = regulator_list_voltage_table,

drivers/regulator/pv88060-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int pv88060_get_current_limit(struct regulator_dev *rdev) 
	return info->current_limits[data];

}



static struct regulator_ops pv88060_buck_ops = {

static const struct regulator_ops pv88060_buck_ops = {

	.get_mode = pv88060_buck_get_mode,

	.set_mode = pv88060_buck_set_mode,

	.enable = regulator_enable_regmap,
@@ -175,7 +175,7 @@ static struct regulator_ops pv88060_buck_ops = { 
	.get_current_limit = pv88060_get_current_limit,

};



static struct regulator_ops pv88060_ldo_ops = {

static const struct regulator_ops pv88060_ldo_ops = {

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,