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

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
...@@ -54,7 +54,7 @@ static const unsigned int pbias_volt_table[] = { ...@@ -54,7 +54,7 @@ static const unsigned int pbias_volt_table[] = {
3000000 3000000
}; };
static struct regulator_ops pbias_regulator_voltage_ops = { static const struct regulator_ops pbias_regulator_voltage_ops = {
.list_voltage = regulator_list_voltage_table, .list_voltage = regulator_list_voltage_table,
.get_voltage_sel = regulator_get_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap,
.set_voltage_sel = regulator_set_voltage_sel_regmap, .set_voltage_sel = regulator_set_voltage_sel_regmap,
......
...@@ -210,7 +210,7 @@ static int pcap_regulator_is_enabled(struct regulator_dev *rdev) ...@@ -210,7 +210,7 @@ static int pcap_regulator_is_enabled(struct regulator_dev *rdev)
return (tmp >> vreg->en) & 1; 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, .list_voltage = regulator_list_voltage_table,
.set_voltage_sel = pcap_regulator_set_voltage_sel, .set_voltage_sel = pcap_regulator_set_voltage_sel,
.get_voltage_sel = pcap_regulator_get_voltage_sel, .get_voltage_sel = pcap_regulator_get_voltage_sel,
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
.enable_mask = PCF50633_REGULATOR_ON, \ .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, .set_voltage_sel = regulator_set_voltage_sel_regmap,
.get_voltage_sel = regulator_get_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap,
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
......
...@@ -126,7 +126,7 @@ static int pfuze100_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) ...@@ -126,7 +126,7 @@ static int pfuze100_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
return ret; return ret;
} }
static struct regulator_ops pfuze100_ldo_regulator_ops = { static const struct regulator_ops pfuze100_ldo_regulator_ops = {
.enable = regulator_enable_regmap, .enable = regulator_enable_regmap,
.disable = regulator_disable_regmap, .disable = regulator_disable_regmap,
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
...@@ -135,14 +135,14 @@ static struct regulator_ops pfuze100_ldo_regulator_ops = { ...@@ -135,14 +135,14 @@ static struct regulator_ops pfuze100_ldo_regulator_ops = {
.get_voltage_sel = regulator_get_voltage_sel_regmap, .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, .enable = regulator_enable_regmap,
.disable = regulator_disable_regmap, .disable = regulator_disable_regmap,
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
.list_voltage = regulator_list_voltage_linear, .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, .list_voltage = regulator_list_voltage_linear,
.set_voltage_sel = regulator_set_voltage_sel_regmap, .set_voltage_sel = regulator_set_voltage_sel_regmap,
.get_voltage_sel = regulator_get_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap,
...@@ -150,7 +150,7 @@ static struct regulator_ops pfuze100_sw_regulator_ops = { ...@@ -150,7 +150,7 @@ static struct regulator_ops pfuze100_sw_regulator_ops = {
.set_ramp_delay = pfuze100_set_ramp_delay, .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, .enable = regulator_enable_regmap,
.disable = regulator_disable_regmap, .disable = regulator_disable_regmap,
.list_voltage = regulator_list_voltage_table, .list_voltage = regulator_list_voltage_table,
......
...@@ -162,7 +162,7 @@ static int pv88060_get_current_limit(struct regulator_dev *rdev) ...@@ -162,7 +162,7 @@ static int pv88060_get_current_limit(struct regulator_dev *rdev)
return info->current_limits[data]; 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, .get_mode = pv88060_buck_get_mode,
.set_mode = pv88060_buck_set_mode, .set_mode = pv88060_buck_set_mode,
.enable = regulator_enable_regmap, .enable = regulator_enable_regmap,
...@@ -175,7 +175,7 @@ static struct regulator_ops pv88060_buck_ops = { ...@@ -175,7 +175,7 @@ static struct regulator_ops pv88060_buck_ops = {
.get_current_limit = pv88060_get_current_limit, .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, .enable = regulator_enable_regmap,
.disable = regulator_disable_regmap, .disable = regulator_disable_regmap,
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment