From: Joakim Zhang <qiangqing.zhang@nxp.com>
To: mkl@pengutronix.de, linux-can@vger.kernel.org
Cc: linux-imx@nxp.com, netdev@vger.kernel.org
Subject: [PATCH linux-can-next/flexcan] can: flexcan: fix TDC feature
Date: Thu, 16 Apr 2020 17:31:26 +0800 [thread overview]
Message-ID: <20200416093126.15242-2-qiangqing.zhang@nxp.com> (raw)
In-Reply-To: <20200416093126.15242-1-qiangqing.zhang@nxp.com>
We enable TDC feature in flexcan_set_bittiming when loopback off, but
disable it by mistake after calling flexcan_set_bittiming.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
drivers/net/can/flexcan.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index b16b8abc1c2c..27f4541d9400 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1202,6 +1202,8 @@ static void flexcan_set_bittiming(struct net_device *dev)
/* for the TDC to work reliably, the offset has to use optimal settings */
reg_fdctrl |= FLEXCAN_FDCTRL_TDCOFF(((dbt->phase_seg1 - 1) + dbt->prop_seg + 2) *
((dbt->brp -1) + 1));
+ } else {
+ reg_fdctrl &= ~FLEXCAN_FDCTRL_TDCEN;
}
priv->write(reg_fdctrl, ®s->fdctrl);
@@ -1354,7 +1356,6 @@ static int flexcan_chip_start(struct net_device *dev)
/* FDCTRL */
if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) {
reg_fdctrl = priv->read(®s->fdctrl) & ~FLEXCAN_FDCTRL_FDRATE;
- reg_fdctrl &= ~FLEXCAN_FDCTRL_TDCEN;
reg_fdctrl &= ~(FLEXCAN_FDCTRL_MBDSR1(0x3) | FLEXCAN_FDCTRL_MBDSR0(0x3));
reg_mcr = priv->read(®s->mcr) & ~FLEXCAN_MCR_FDEN;
reg_ctrl2 = priv->read(®s->ctrl2) & ~FLEXCAN_CTRL2_ISOCANFDEN;
--
2.17.1
next prev parent reply other threads:[~2020-04-16 9:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 9:31 [PATCH Resend linux-can-next/testing] can: flexcan: add correctable errors correction when HW supports ECC Joakim Zhang
2020-04-16 9:31 ` Joakim Zhang [this message]
2020-04-16 9:41 ` [PATCH linux-can-next/flexcan] can: flexcan: fix TDC feature Joakim Zhang
2020-06-02 10:15 ` Michael Walle
2020-06-25 12:37 ` Michael Walle
2020-06-25 12:56 ` Marc Kleine-Budde
2020-06-29 5:37 ` Joakim Zhang
2020-06-29 16:23 ` Michael Walle
2020-06-30 2:25 ` Joakim Zhang
2020-09-15 22:16 ` Marc Kleine-Budde
2020-09-16 2:26 ` Joakim Zhang
2020-09-15 22:15 ` Marc Kleine-Budde
2020-07-23 21:09 ` Michael Walle
2020-09-14 15:16 ` Michael Walle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200416093126.15242-2-qiangqing.zhang@nxp.com \
--to=qiangqing.zhang@nxp.com \
--cc=linux-can@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).