Commit e7cf34ef authored by Nishanth Menon's avatar Nishanth Menon Committed by Mark Brown

regulator: palmas: Rename reg_info to palmas_reg_info

reg_info is a generic term which might cause conflict at a later point
in time. To prevent such a thing from occuring in future, rename to
palmas_reg_info.
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Tested-by: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 4b09e17b
...@@ -41,7 +41,7 @@ static const struct regulator_linear_range smps_high_ranges[] = { ...@@ -41,7 +41,7 @@ static const struct regulator_linear_range smps_high_ranges[] = {
REGULATOR_LINEAR_RANGE(3300000, 0x7A, 0x7f, 0), REGULATOR_LINEAR_RANGE(3300000, 0x7A, 0x7f, 0),
}; };
static struct regs_info palmas_regs_info[] = { static struct palmas_regs_info palmas_regs_info[] = {
{ {
.name = "SMPS12", .name = "SMPS12",
.sname = "smps1-in", .sname = "smps1-in",
...@@ -227,7 +227,7 @@ static struct regs_info palmas_regs_info[] = { ...@@ -227,7 +227,7 @@ static struct regs_info palmas_regs_info[] = {
}, },
}; };
static struct regs_info tps65917_regs_info[] = { static struct palmas_regs_info tps65917_regs_info[] = {
{ {
.name = "SMPS1", .name = "SMPS1",
.sname = "smps1-in", .sname = "smps1-in",
......
...@@ -102,7 +102,7 @@ struct palmas_sleep_requestor_info { ...@@ -102,7 +102,7 @@ struct palmas_sleep_requestor_info {
int bit_pos; int bit_pos;
}; };
struct regs_info { struct palmas_regs_info {
char *name; char *name;
char *sname; char *sname;
u8 vsel_addr; u8 vsel_addr;
...@@ -117,7 +117,7 @@ struct palmas_pmic_driver_data { ...@@ -117,7 +117,7 @@ struct palmas_pmic_driver_data {
int ldo_begin; int ldo_begin;
int ldo_end; int ldo_end;
int max_reg; int max_reg;
struct regs_info *palmas_regs_info; struct palmas_regs_info *palmas_regs_info;
struct of_regulator_match *palmas_matches; struct of_regulator_match *palmas_matches;
struct palmas_sleep_requestor_info *sleep_req_info; struct palmas_sleep_requestor_info *sleep_req_info;
int (*smps_register)(struct palmas_pmic *pmic, int (*smps_register)(struct palmas_pmic *pmic,
......
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