Merge tag 'reset-fixes-for-4.18' of git://git.pengutronix.de/git/pza/…

…linux into next/late Reset controller fixes for v4.18 This tag fixes reset assertion on i.MX7 for all non-inverted reset control bits. Currently only PCIE controller and PHY resets are used. * tag 'reset-fixes-for-4.18' of git://git.pengutronix.de/git/pza/linux: reset: imx7: Fix always writing bits as 0 Signed-off-by: Olof Johansson <[email protected]>
kmaincent · Aug 24, 2018 · 5920cce · 5920cce
2 parents c37aad3 + 26fce05
commit 5920cce
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
@@ -80,7 +80,7 @@ static int imx7_reset_set(struct reset_controller_dev *rcdev,
 {
 	struct imx7_src *imx7src = to_imx7_src(rcdev);
 	const struct imx7_src_signal *signal = &imx7_src_signals[id];
-	unsigned int value = 0;
+	unsigned int value = assert ? signal->bit : 0;
 
 	switch (id) {
 	case IMX7_RESET_PCIEPHY: