hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'regulator/fix/debugfs' and 'regulator/fix/tps65086' into regulator-linus

This commit is contained in:
Mark Brown 2017-02-19 16:40:22 +00:00
parent 1c35539cd7 e42a46b6f5 6308f1787f
commit 0fe3f971fc
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/regulator/core.c
View File

@ -4391,12 +4391,13 @@ static void regulator_summary_show_subtree(struct seq_file *s,
seq_puts(s, "\n"); seq_puts(s, "\n");
list_for_each_entry(consumer, &rdev->consumer_list, list) { list_for_each_entry(consumer, &rdev->consumer_list, list) {
if (consumer->dev->class == &regulator_class) if (consumer->dev && consumer->dev->class == &regulator_class)
continue; continue;
seq_printf(s, "%*s%-*s ", seq_printf(s, "%*s%-*s ",
(level + 1) * 3 + 1, "", (level + 1) * 3 + 1, "",
30 - (level + 1) * 3, dev_name(consumer->dev)); 30 - (level + 1) * 3,
consumer->dev ? dev_name(consumer->dev) : "deviceless");
switch (rdev->desc->type) { switch (rdev->desc->type) {
case REGULATOR_VOLTAGE: case REGULATOR_VOLTAGE:

10
drivers/regulator/tps65086-regulator.c
View File

@ -157,19 +157,19 @@ static struct tps65086_regulator regulators[] = {
VDOA23_VID_MASK, TPS65086_LDOA3CTRL, BIT(0), VDOA23_VID_MASK, TPS65086_LDOA3CTRL, BIT(0),
tps65086_ldoa23_ranges, 0, 0), tps65086_ldoa23_ranges, 0, 0),
TPS65086_SWITCH("SWA1", "swa1", SWA1, TPS65086_SWVTT_EN, BIT(5)), TPS65086_SWITCH("SWA1", "swa1", SWA1, TPS65086_SWVTT_EN, BIT(5)),
TPS65086_SWITCH("SWB1", "swa2", SWB1, TPS65086_SWVTT_EN, BIT(6)), TPS65086_SWITCH("SWB1", "swb1", SWB1, TPS65086_SWVTT_EN, BIT(6)),
TPS65086_SWITCH("SWB2", "swa3", SWB2, TPS65086_SWVTT_EN, BIT(7)), TPS65086_SWITCH("SWB2", "swb2", SWB2, TPS65086_SWVTT_EN, BIT(7)),
TPS65086_SWITCH("VTT", "vtt", VTT, TPS65086_SWVTT_EN, BIT(4)), TPS65086_SWITCH("VTT", "vtt", VTT, TPS65086_SWVTT_EN, BIT(4)),
}; };
static int tps65086_of_parse_cb(struct device_node *dev, static int tps65086_of_parse_cb(struct device_node *node,
const struct regulator_desc *desc, const struct regulator_desc *desc,
struct regulator_config *config) struct regulator_config *config)
{ {
int ret; int ret;
/* Check for 25mV step mode */ /* Check for 25mV step mode */
if (of_property_read_bool(config->of_node, "ti,regulator-step-size-25mv")) { if (of_property_read_bool(node, "ti,regulator-step-size-25mv")) {
switch (desc->id) { switch (desc->id) {
case BUCK1: case BUCK1:
case BUCK2: case BUCK2:
@ -193,7 +193,7 @@ static int tps65086_of_parse_cb(struct device_node *dev,
} }
/* Check for decay mode */ /* Check for decay mode */
if (desc->id <= BUCK6 && of_property_read_bool(config->of_node, "ti,regulator-decay")) { if (desc->id <= BUCK6 && of_property_read_bool(node, "ti,regulator-decay")) {
ret = regmap_write_bits(config->regmap, ret = regmap_write_bits(config->regmap,
regulators[desc->id].decay_reg, regulators[desc->id].decay_reg,
regulators[desc->id].decay_mask, regulators[desc->id].decay_mask,