projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regulator: max5970: Fix regulator child node name
[linux-block.git]
/
drivers
/
regulator
/
max5970-regulator.c
diff --git
a/drivers/regulator/max5970-regulator.c
b/drivers/regulator/max5970-regulator.c
index bc88a40a88d4cac0bbe61efc4725703b1136654e..8bbcd983a74aa8d8e5db6ae9e9cb7480a9220575 100644
(file)
--- a/
drivers/regulator/max5970-regulator.c
+++ b/
drivers/regulator/max5970-regulator.c
@@
-29,8
+29,8
@@
struct max5970_regulator {
};
enum max597x_regulator_id {
};
enum max597x_regulator_id {
- MAX597X_
SW
0,
- MAX597X_
SW
1,
+ MAX597X_
sw
0,
+ MAX597X_
sw
1,
};
static int max5970_read_adc(struct regmap *regmap, int reg, long *val)
};
static int max5970_read_adc(struct regmap *regmap, int reg, long *val)
@@
-378,8
+378,8
@@
static int max597x_dt_parse(struct device_node *np,
}
static const struct regulator_desc regulators[] = {
}
static const struct regulator_desc regulators[] = {
- MAX597X_SWITCH(
SW
0, MAX5970_REG_CHXEN, 0, "vss1"),
- MAX597X_SWITCH(
SW
1, MAX5970_REG_CHXEN, 1, "vss2"),
+ MAX597X_SWITCH(
sw
0, MAX5970_REG_CHXEN, 0, "vss1"),
+ MAX597X_SWITCH(
sw
1, MAX5970_REG_CHXEN, 1, "vss2"),
};
static int max597x_regmap_read_clear(struct regmap *map, unsigned int reg,
};
static int max597x_regmap_read_clear(struct regmap *map, unsigned int reg,
@@
-392,7
+392,7
@@
static int max597x_regmap_read_clear(struct regmap *map, unsigned int reg,
return ret;
if (*val)
return ret;
if (*val)
- return regmap_write(map, reg,
*val
);
+ return regmap_write(map, reg,
0
);
return 0;
}
return 0;
}