leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/rn5t618' into regulator-linus

Browse Source
This commit is contained in:
Mark Brown 2017-10-23 11:46:30 +02:00
commit 2ab19d521e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/axp20x-regulator.c
View File

@ -590,7 +590,7 @@ static bool axp20x_is_polyphase_slave(struct axp20x_dev *axp20x, int id)
case AXP803_DCDC3: case AXP803_DCDC3:
return !!(reg & BIT(6)); return !!(reg & BIT(6));
case AXP803_DCDC6: case AXP803_DCDC6:
return !!(reg & BIT(7)); return !!(reg & BIT(5));
} }
break; break;

2
drivers/regulator/rn5t618-regulator.c
View File

@ -29,7 +29,7 @@ static const struct regulator_ops rn5t618_reg_ops = {
}; };
#define REG(rid, ereg, emask, vreg, vmask, min, max, step) \ #define REG(rid, ereg, emask, vreg, vmask, min, max, step) \
[RN5T618_##rid] = { \ { \
.name = #rid, \ .name = #rid, \
.of_match = of_match_ptr(#rid), \ .of_match = of_match_ptr(#rid), \
.regulators_node = of_match_ptr("regulators"), \ .regulators_node = of_match_ptr("regulators"), \