redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

MLK-23582 can: flexcan: fix TDC feature 

We enable TDC feature in flexcan_set_bittiming when loopback off, but
disable it by mistake after calling flexcan_set_bittiming.

Acked-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Joakim Zhang 2020-03-30 09:59:26 +08:00
parent 029bf5a02b
commit 63138e7e44
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/can/flexcan.c
View File

@ -1274,6 +1274,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, &regs->fdctrl);
@ -1501,7 +1503,6 @@ static int flexcan_chip_start(struct net_device *dev)
/* FDCTRL */
if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) {
reg_fdctrl = priv->read(&regs->fdctrl) & ~FLEXCAN_FDCTRL_FDRATE;
reg_fdctrl &= ~FLEXCAN_FDCTRL_TDCEN;
reg_fdctrl &= ~(FLEXCAN_FDCTRL_MBDSR1(0x3) | FLEXCAN_FDCTRL_MBDSR0(0x3));
reg_mcr = priv->read(&regs->mcr) & ~FLEXCAN_MCR_FDEN;
reg_ctrl2 = priv->read(&regs->ctrl2) & ~FLEXCAN_CTRL2_ISOCANFDEN;