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

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

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
parents 250320b0 f9e93acc 18c6c42c 634dc7ab 404826cb b68f9078

drivers/regulator/ltc3676.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */

static struct regulator_ops ltc3676_linear_regulator_ops = {

static const struct regulator_ops ltc3676_linear_regulator_ops = {

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,
@@ -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 */

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) */

static struct regulator_ops ltc3676_fixed_regulator_ops = {

static const struct regulator_ops ltc3676_fixed_regulator_ops = {

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,

drivers/regulator/max14577-regulator.c

+3 −3
Original line number Diff line number Diff line
@@ -85,14 +85,14 @@ static int max14577_reg_set_current_limit(struct regulator_dev *rdev, 
			reg_data);

}



static struct regulator_ops max14577_safeout_ops = {

static const struct regulator_ops max14577_safeout_ops = {

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.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,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,
@@ -130,7 +130,7 @@ static const struct regulator_desc max14577_supported_regulators[] = { 
	[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,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

drivers/regulator/max77620-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static int max77620_of_parse_cb(struct device_node *np, 
	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,

	.enable = max77620_regulator_enable,

	.disable = max77620_regulator_disable,

drivers/regulator/max77686-regulator.c

+4 −4
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int max77686_of_parse_cb(struct device_node *np, 
	return 0;

}



static struct regulator_ops max77686_ops = {

static const struct regulator_ops max77686_ops = {

	.list_voltage		= regulator_list_voltage_linear,

	.map_voltage		= regulator_map_voltage_linear,

	.is_enabled		= regulator_is_enabled_regmap,
@@ -301,7 +301,7 @@ static struct regulator_ops max77686_ops = { 
	.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,

	.map_voltage		= regulator_map_voltage_linear,

	.is_enabled		= regulator_is_enabled_regmap,
@@ -314,7 +314,7 @@ static struct regulator_ops max77686_ldo_ops = { 
	.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,

	.map_voltage		= regulator_map_voltage_linear,

	.is_enabled		= regulator_is_enabled_regmap,
@@ -326,7 +326,7 @@ static struct regulator_ops max77686_buck1_ops = { 
	.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,

	.map_voltage		= regulator_map_voltage_linear,

	.is_enabled		= regulator_is_enabled_regmap,

drivers/regulator/max77693-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static const unsigned int max77693_safeout_table[] = { 
	3300000,

};



static struct regulator_ops max77693_safeout_ops = {

static const struct regulator_ops max77693_safeout_ops = {

	.list_voltage		= regulator_list_voltage_table,

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,