summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-08-24 18:49:57 +0300
committerOlof Johansson <olof@lixom.net>2018-08-24 18:49:57 +0300
commit5920cce8569e36ffe966959833e0eeb80a91638c (patch)
tree80fc2043fa83c173b14579188fba3cb61dbd1eec /drivers
parentc37aad3612c4a9e01ca69ad07b8ca41dbd222c46 (diff)
parent26fce0557fa639fb7bbc33e31a57cff7df25c3a0 (diff)
downloadlinux-5920cce8569e36ffe966959833e0eeb80a91638c.tar.xz
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 <olof@lixom.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/reset/reset-imx7.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index 4db177bc89bc..fdeac1946429 100644
--- 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: