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

Commit 2ab19d52 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/axp20x' and... 

Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/rn5t618' into regulator-linus
parents 33d930e5 986e7b7e d824c7a8

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"),		\