diff options
author | Joakim Zhang <qiangqing.zhang@nxp.com> | 2021-02-18 19:00:35 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-17 17:06:11 +0100 |
commit | 98b7f969116df96c57e9a8572620d71e92fcb725 (patch) | |
tree | ccfecb51cd141fc6573967bfc759ec2c15561010 /drivers/net/can/flexcan.c | |
parent | 4224890edff1b4679dc8ddeaa69b43efce5366ba (diff) | |
download | kernel_replicant_linux-98b7f969116df96c57e9a8572620d71e92fcb725.tar.gz kernel_replicant_linux-98b7f969116df96c57e9a8572620d71e92fcb725.tar.bz2 kernel_replicant_linux-98b7f969116df96c57e9a8572620d71e92fcb725.zip |
can: flexcan: assert FRZ bit in flexcan_chip_freeze()
commit 449052cfebf624b670faa040245d3feed770d22f upstream.
Assert HALT bit to enter freeze mode, there is a premise that FRZ bit is
asserted. This patch asserts FRZ bit in flexcan_chip_freeze, although
the reset value is 1b'1. This is a prepare patch, later patch will
invoke flexcan_chip_freeze() to enter freeze mode, which polling freeze
mode acknowledge.
Fixes: b1aa1c7a2165b ("can: flexcan: fix transition from and to freeze mode in chip_{,un}freeze")
Link: https://lore.kernel.org/r/20210218110037.16591-2-qiangqing.zhang@nxp.com
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/can/flexcan.c')
-rw-r--r-- | drivers/net/can/flexcan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 99e5f272205d..0420ce47ba40 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -662,7 +662,7 @@ static int flexcan_chip_freeze(struct flexcan_priv *priv) u32 reg; reg = priv->read(®s->mcr); - reg |= FLEXCAN_MCR_HALT; + reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT; priv->write(reg, ®s->mcr); while (timeout-- && !(priv->read(®s->mcr) & FLEXCAN_MCR_FRZ_ACK)) |