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

regulator: Fixes for v4.15 

A couple of small driver specific bug fixes that have been collected
 since the merge window.
 -----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlntyZQTHGJyb29uaWVA
 a2VybmVsLm9yZwAKCRAk1otyXVSH0CtcB/9+bk0sc7RgEw+M6IqvGUWtV7W+wxTZ
 PsZkTwoLj613gvPtJegKlP5sd0EToNTg+FTDoPyuHdR3PFJk0U6ifYZfDJI+9O16
 NsOK8qljHZBWeTgXftYrGF/bFlTjf47nqymnYSvH/+M1DXCxIOGWe+1/aSq9A9Xf
 zFBUQE6Qt1MUC2nRoKrIR3feemzEFIdzX4tft0u2sk2aZdi78hBxlPTckprNYBwY
 vDcsnmRLY7uBw6OhCOpdNlisEW+FKxMQrRabYaeCFj9KAM8DYEiWwW9BQoyvd9+R
 eb0HKKse+73iGgyZpCunsy7766t08mNoLGNsrnQvC2Li2ebiBMplb8bX
 =PGp9
 -----END PGP SIGNATURE-----

Merge tag 'regulator-fix-v4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A couple of small driver specific bug fixes that have been collected
  since the merge window"

* tag 'regulator-fix-v4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: rn5t618: Do not index regulator_desc arrays by id
  regulator: axp20x: Fix poly-phase bit offset for AXP803 DCDC5/6
This commit is contained in:
Linus Torvalds 2017-10-23 10:32:59 -04:00
parent bb176f6709 2ab19d521e
commit 468b0e0cf8
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:
return !!(reg & BIT(6));
case AXP803_DCDC6:
return !!(reg & BIT(7));
return !!(reg & BIT(5));
}
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) \
[RN5T618_##rid] = { \
{ \
.name = #rid, \
.of_match = of_match_ptr(#rid), \
.regulators_node = of_match_ptr("regulators"), \