Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 468b0e0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v4.14-rc5' of... 

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
parents bb176f67 2ab19d52

drivers/regulator/axp20x-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/regulator/rn5t618-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -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"),		\