Commit 84e58d19 authored by Mark Brown's avatar Mark Brown

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

Merge remote-tracking branches 'regulator/topic/ltc3676', 'regulator/topic/max14577', 'regulator/topic/max77620', 'regulator/topic/max77686' and 'regulator/topic/max77693' into regulator-next
...@@ -161,7 +161,7 @@ static int ltc3676_of_parse_cb(struct device_node *np, ...@@ -161,7 +161,7 @@ static int ltc3676_of_parse_cb(struct device_node *np,
} }
/* SW1, SW2, SW3, SW4 linear 0.8V-3.3V with scalar via R1/R2 feeback res */ /* SW1, SW2, SW3, SW4 linear 0.8V-3.3V with scalar via R1/R2 feeback res */
static struct regulator_ops ltc3676_linear_regulator_ops = { static const struct regulator_ops ltc3676_linear_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,
...@@ -173,11 +173,11 @@ static struct regulator_ops ltc3676_linear_regulator_ops = { ...@@ -173,11 +173,11 @@ static struct regulator_ops ltc3676_linear_regulator_ops = {
}; };
/* LDO1 always on fixed 0.8V-3.3V via scalar via R1/R2 feeback res */ /* LDO1 always on fixed 0.8V-3.3V via scalar via R1/R2 feeback res */
static struct regulator_ops ltc3676_fixed_standby_regulator_ops = { static const struct regulator_ops ltc3676_fixed_standby_regulator_ops = {
}; };
/* LDO2, LDO3 fixed (LDO2 has external scalar via R1/R2 feedback res) */ /* LDO2, LDO3 fixed (LDO2 has external scalar via R1/R2 feedback res) */
static struct regulator_ops ltc3676_fixed_regulator_ops = { static const struct regulator_ops ltc3676_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,
......
...@@ -85,14 +85,14 @@ static int max14577_reg_set_current_limit(struct regulator_dev *rdev, ...@@ -85,14 +85,14 @@ static int max14577_reg_set_current_limit(struct regulator_dev *rdev,
reg_data); reg_data);
} }
static struct regulator_ops max14577_safeout_ops = { static const struct regulator_ops max14577_safeout_ops = {
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
.enable = regulator_enable_regmap, .enable = regulator_enable_regmap,
.disable = regulator_disable_regmap, .disable = regulator_disable_regmap,
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
}; };
static struct regulator_ops max14577_charger_ops = { static const struct regulator_ops max14577_charger_ops = {
.is_enabled = max14577_reg_is_enabled, .is_enabled = max14577_reg_is_enabled,
.enable = regulator_enable_regmap, .enable = regulator_enable_regmap,
.disable = regulator_disable_regmap, .disable = regulator_disable_regmap,
...@@ -130,7 +130,7 @@ static const struct regulator_desc max14577_supported_regulators[] = { ...@@ -130,7 +130,7 @@ static const struct regulator_desc max14577_supported_regulators[] = {
[MAX14577_CHARGER] = MAX14577_CHARGER_REG, [MAX14577_CHARGER] = MAX14577_CHARGER_REG,
}; };
static struct regulator_ops max77836_ldo_ops = { static const struct regulator_ops max77836_ldo_ops = {
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
.enable = regulator_enable_regmap, .enable = regulator_enable_regmap,
.disable = regulator_disable_regmap, .disable = regulator_disable_regmap,
......
...@@ -644,7 +644,7 @@ static int max77620_of_parse_cb(struct device_node *np, ...@@ -644,7 +644,7 @@ static int max77620_of_parse_cb(struct device_node *np,
return max77620_init_pmic(pmic, desc->id); return max77620_init_pmic(pmic, desc->id);
} }
static struct regulator_ops max77620_regulator_ops = { static const struct regulator_ops max77620_regulator_ops = {
.is_enabled = max77620_regulator_is_enabled, .is_enabled = max77620_regulator_is_enabled,
.enable = max77620_regulator_enable, .enable = max77620_regulator_enable,
.disable = max77620_regulator_disable, .disable = max77620_regulator_disable,
......
...@@ -289,7 +289,7 @@ static int max77686_of_parse_cb(struct device_node *np, ...@@ -289,7 +289,7 @@ static int max77686_of_parse_cb(struct device_node *np,
return 0; return 0;
} }
static struct regulator_ops max77686_ops = { static const struct regulator_ops max77686_ops = {
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear, .map_voltage = regulator_map_voltage_linear,
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
...@@ -301,7 +301,7 @@ static struct regulator_ops max77686_ops = { ...@@ -301,7 +301,7 @@ static struct regulator_ops max77686_ops = {
.set_suspend_mode = max77686_set_suspend_mode, .set_suspend_mode = max77686_set_suspend_mode,
}; };
static struct regulator_ops max77686_ldo_ops = { static const struct regulator_ops max77686_ldo_ops = {
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear, .map_voltage = regulator_map_voltage_linear,
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
...@@ -314,7 +314,7 @@ static struct regulator_ops max77686_ldo_ops = { ...@@ -314,7 +314,7 @@ static struct regulator_ops max77686_ldo_ops = {
.set_suspend_disable = max77686_set_suspend_disable, .set_suspend_disable = max77686_set_suspend_disable,
}; };
static struct regulator_ops max77686_buck1_ops = { static const struct regulator_ops max77686_buck1_ops = {
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear, .map_voltage = regulator_map_voltage_linear,
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
...@@ -326,7 +326,7 @@ static struct regulator_ops max77686_buck1_ops = { ...@@ -326,7 +326,7 @@ static struct regulator_ops max77686_buck1_ops = {
.set_suspend_disable = max77686_set_suspend_disable, .set_suspend_disable = max77686_set_suspend_disable,
}; };
static struct regulator_ops max77686_buck_dvs_ops = { static const struct regulator_ops max77686_buck_dvs_ops = {
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear, .map_voltage = regulator_map_voltage_linear,
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
......
...@@ -141,7 +141,7 @@ static const unsigned int max77693_safeout_table[] = { ...@@ -141,7 +141,7 @@ static const unsigned int max77693_safeout_table[] = {
3300000, 3300000,
}; };
static struct regulator_ops max77693_safeout_ops = { static const struct regulator_ops max77693_safeout_ops = {
.list_voltage = regulator_list_voltage_table, .list_voltage = regulator_list_voltage_table,
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
.enable = regulator_enable_regmap, .enable = regulator_enable_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