Commit f88140af authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branches 'regulator/topic/88pm800',...

Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/88pm8607', 'regulator/topic/aat2870', 'regulator/topic/act8945a' and 'regulator/topic/ad5938' into regulator-next
...@@ -180,7 +180,7 @@ static int pm800_get_current_limit(struct regulator_dev *rdev) ...@@ -180,7 +180,7 @@ static int pm800_get_current_limit(struct regulator_dev *rdev)
return info->max_ua; return info->max_ua;
} }
static struct regulator_ops pm800_volt_range_ops = { static const struct regulator_ops pm800_volt_range_ops = {
.list_voltage = regulator_list_voltage_linear_range, .list_voltage = regulator_list_voltage_linear_range,
.map_voltage = regulator_map_voltage_linear_range, .map_voltage = regulator_map_voltage_linear_range,
.set_voltage_sel = regulator_set_voltage_sel_regmap, .set_voltage_sel = regulator_set_voltage_sel_regmap,
...@@ -191,7 +191,7 @@ static struct regulator_ops pm800_volt_range_ops = { ...@@ -191,7 +191,7 @@ static struct regulator_ops pm800_volt_range_ops = {
.get_current_limit = pm800_get_current_limit, .get_current_limit = pm800_get_current_limit,
}; };
static struct regulator_ops pm800_volt_table_ops = { static const struct regulator_ops pm800_volt_table_ops = {
.list_voltage = regulator_list_voltage_table, .list_voltage = regulator_list_voltage_table,
.map_voltage = regulator_map_voltage_iterate, .map_voltage = regulator_map_voltage_iterate,
.set_voltage_sel = regulator_set_voltage_sel_regmap, .set_voltage_sel = regulator_set_voltage_sel_regmap,
......
...@@ -220,7 +220,7 @@ static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index) ...@@ -220,7 +220,7 @@ static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index)
return ret; return ret;
} }
static struct regulator_ops pm8607_regulator_ops = { static const struct regulator_ops pm8607_regulator_ops = {
.list_voltage = pm8607_list_voltage, .list_voltage = pm8607_list_voltage,
.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,
...@@ -229,7 +229,7 @@ static struct regulator_ops pm8607_regulator_ops = { ...@@ -229,7 +229,7 @@ static struct regulator_ops pm8607_regulator_ops = {
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
}; };
static struct regulator_ops pm8606_preg_ops = { static const struct regulator_ops pm8606_preg_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,
......
...@@ -97,7 +97,7 @@ static int aat2870_ldo_is_enabled(struct regulator_dev *rdev) ...@@ -97,7 +97,7 @@ static int aat2870_ldo_is_enabled(struct regulator_dev *rdev)
return val & ri->enable_mask ? 1 : 0; return val & ri->enable_mask ? 1 : 0;
} }
static struct regulator_ops aat2870_ldo_ops = { static const struct regulator_ops aat2870_ldo_ops = {
.list_voltage = regulator_list_voltage_table, .list_voltage = regulator_list_voltage_table,
.map_voltage = regulator_map_voltage_ascend, .map_voltage = regulator_map_voltage_ascend,
.set_voltage_sel = aat2870_ldo_set_voltage_sel, .set_voltage_sel = aat2870_ldo_set_voltage_sel,
......
...@@ -69,7 +69,7 @@ static const struct regulator_linear_range act8945a_voltage_ranges[] = { ...@@ -69,7 +69,7 @@ static const struct regulator_linear_range act8945a_voltage_ranges[] = {
REGULATOR_LINEAR_RANGE(2400000, 48, 63, 100000), REGULATOR_LINEAR_RANGE(2400000, 48, 63, 100000),
}; };
static struct regulator_ops act8945a_ops = { static const struct regulator_ops act8945a_ops = {
.list_voltage = regulator_list_voltage_linear_range, .list_voltage = regulator_list_voltage_linear_range,
.map_voltage = regulator_map_voltage_linear_range, .map_voltage = regulator_map_voltage_linear_range,
.get_voltage_sel = regulator_get_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap,
......
...@@ -181,7 +181,7 @@ static int ad5398_disable(struct regulator_dev *rdev) ...@@ -181,7 +181,7 @@ static int ad5398_disable(struct regulator_dev *rdev)
return ret; return ret;
} }
static struct regulator_ops ad5398_ops = { static const struct regulator_ops ad5398_ops = {
.get_current_limit = ad5398_get_current_limit, .get_current_limit = ad5398_get_current_limit,
.set_current_limit = ad5398_set_current_limit, .set_current_limit = ad5398_set_current_limit,
.enable = ad5398_enable, .enable = ad5398_enable,
......
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