Unverified Commit 7c027c66 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: stpmic1: Add static const qualifier at peroper places 



The regulator_linear_range arrays and stpmic1_regulator_cfgs are only
accessed by this driver and the values are never changed so make them
static const. regulator_ops variables can also be const.
Also clean up a few empty lines in regulator_linear_range array.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 45b5d2b7

drivers/regulator/stpmic1_regulator.c

+17 −21
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct stpmic1_regulator_cfg { 
struct stpmic1_regulator {

	unsigned int regul_id;

	struct device_node *reg_node;

	struct stpmic1_regulator_cfg *cfg;

	const struct stpmic1_regulator_cfg *cfg;

	u8 mask_reset;

	int irq_curlim;

	struct regmap *regmap;
@@ -75,12 +75,12 @@ enum { 
#define STPMIC1_BUCK_MODE_NORMAL 0

#define STPMIC1_BUCK_MODE_LP BUCK_HPLP_ENABLE_MASK



struct regulator_linear_range buck1_ranges[] = {

static const struct regulator_linear_range buck1_ranges[] = {

	REGULATOR_LINEAR_RANGE(600000, 0, 30, 25000),

	REGULATOR_LINEAR_RANGE(1350000, 31, 63, 0),

};



struct regulator_linear_range buck2_ranges[] = {

static const struct regulator_linear_range buck2_ranges[] = {

	REGULATOR_LINEAR_RANGE(1000000, 0, 17, 0),

	REGULATOR_LINEAR_RANGE(1050000, 18, 19, 0),

	REGULATOR_LINEAR_RANGE(1100000, 20, 21, 0),
@@ -94,7 +94,7 @@ struct regulator_linear_range buck2_ranges[] = { 
	REGULATOR_LINEAR_RANGE(1500000, 36, 63, 0),

};



struct regulator_linear_range buck3_ranges[] = {

static const struct regulator_linear_range buck3_ranges[] = {

	REGULATOR_LINEAR_RANGE(1000000, 0, 19, 0),

	REGULATOR_LINEAR_RANGE(1100000, 20, 23, 0),

	REGULATOR_LINEAR_RANGE(1200000, 24, 27, 0),
@@ -102,10 +102,9 @@ struct regulator_linear_range buck3_ranges[] = { 
	REGULATOR_LINEAR_RANGE(1400000, 32, 35, 0),

	REGULATOR_LINEAR_RANGE(1500000, 36, 55, 100000),

	REGULATOR_LINEAR_RANGE(3400000, 56, 63, 0),



};



struct regulator_linear_range buck4_ranges[] = {

static const struct regulator_linear_range buck4_ranges[] = {

	REGULATOR_LINEAR_RANGE(600000, 0, 27, 25000),

	REGULATOR_LINEAR_RANGE(1300000, 28, 29, 0),

	REGULATOR_LINEAR_RANGE(1350000, 30, 31, 0),
@@ -113,24 +112,21 @@ struct regulator_linear_range buck4_ranges[] = { 
	REGULATOR_LINEAR_RANGE(1450000, 34, 35, 0),

	REGULATOR_LINEAR_RANGE(1500000, 36, 60, 100000),

	REGULATOR_LINEAR_RANGE(3900000, 61, 63, 0),



};



struct regulator_linear_range ldo1_ranges[] = {

static const struct regulator_linear_range ldo1_ranges[] = {

	REGULATOR_LINEAR_RANGE(1700000, 0, 7, 0),

	REGULATOR_LINEAR_RANGE(1700000, 8, 24, 100000),

	REGULATOR_LINEAR_RANGE(3300000, 25, 31, 0),



};



struct regulator_linear_range ldo2_ranges[] = {

static const struct regulator_linear_range ldo2_ranges[] = {

	REGULATOR_LINEAR_RANGE(1700000, 0, 7, 0),

	REGULATOR_LINEAR_RANGE(1700000, 8, 24, 100000),

	REGULATOR_LINEAR_RANGE(3300000, 25, 30, 0),



};



struct regulator_linear_range ldo3_ranges[] = {

static const struct regulator_linear_range ldo3_ranges[] = {

	REGULATOR_LINEAR_RANGE(1700000, 0, 7, 0),

	REGULATOR_LINEAR_RANGE(1700000, 8, 24, 100000),

	REGULATOR_LINEAR_RANGE(3300000, 25, 30, 0),
@@ -138,18 +134,18 @@ struct regulator_linear_range ldo3_ranges[] = { 
	REGULATOR_LINEAR_RANGE(500000, 31, 31, 0),

};



struct regulator_linear_range ldo5_ranges[] = {

static const struct regulator_linear_range ldo5_ranges[] = {

	REGULATOR_LINEAR_RANGE(1700000, 0, 7, 0),

	REGULATOR_LINEAR_RANGE(1700000, 8, 30, 100000),

	REGULATOR_LINEAR_RANGE(3900000, 31, 31, 0),

};



struct regulator_linear_range ldo6_ranges[] = {

static const struct regulator_linear_range ldo6_ranges[] = {

	REGULATOR_LINEAR_RANGE(900000, 0, 24, 100000),

	REGULATOR_LINEAR_RANGE(3300000, 25, 31, 0),

};



static struct regulator_ops stpmic1_ldo_ops = {

static const struct regulator_ops stpmic1_ldo_ops = {

	.list_voltage = regulator_list_voltage_linear_range,

	.map_voltage = regulator_map_voltage_linear_range,

	.is_enabled = regulator_is_enabled_regmap,
@@ -161,7 +157,7 @@ static struct regulator_ops stpmic1_ldo_ops = { 
	.set_over_current_protection = stpmic1_set_icc,

};



static struct regulator_ops stpmic1_ldo3_ops = {

static const struct regulator_ops stpmic1_ldo3_ops = {

	.list_voltage = regulator_list_voltage_linear_range,

	.map_voltage = regulator_map_voltage_iterate,

	.is_enabled = regulator_is_enabled_regmap,
@@ -175,7 +171,7 @@ static struct regulator_ops stpmic1_ldo3_ops = { 
	.set_over_current_protection = stpmic1_set_icc,

};



static struct regulator_ops stpmic1_ldo4_fixed_regul_ops = {

static const struct regulator_ops stpmic1_ldo4_fixed_regul_ops = {

	.is_enabled = regulator_is_enabled_regmap,

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,
@@ -183,7 +179,7 @@ static struct regulator_ops stpmic1_ldo4_fixed_regul_ops = { 
	.set_over_current_protection = stpmic1_set_icc,

};



static struct regulator_ops stpmic1_buck_ops = {

static const struct regulator_ops stpmic1_buck_ops = {

	.list_voltage = regulator_list_voltage_linear_range,

	.map_voltage = regulator_map_voltage_linear_range,

	.is_enabled = regulator_is_enabled_regmap,
@@ -197,14 +193,14 @@ static struct regulator_ops stpmic1_buck_ops = { 
	.set_over_current_protection = stpmic1_set_icc,

};



static struct regulator_ops stpmic1_vref_ddr_ops = {

static const struct regulator_ops stpmic1_vref_ddr_ops = {

	.is_enabled = regulator_is_enabled_regmap,

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.set_pull_down = regulator_set_pull_down_regmap,

};



static struct regulator_ops stpmic1_switch_regul_ops = {

static const struct regulator_ops stpmic1_switch_regul_ops = {

	.is_enabled = regulator_is_enabled_regmap,

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,
@@ -334,7 +330,7 @@ static struct regulator_ops stpmic1_switch_regul_ops = { 
	.supply_name = #base, \

}



struct stpmic1_regulator_cfg stpmic1_regulator_cfgs[] = {

static const struct stpmic1_regulator_cfg stpmic1_regulator_cfgs[] = {

	[STPMIC1_BUCK1] = {

		.desc = REG_BUCK(BUCK1, buck1),

		.icc_reg = BUCKS_ICCTO_CR,

CRA Git | Maintained and supported by SUSTech CRA and CCSE