summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivas Neeli <srinivas.neeli@xilinx.com>2019-08-12 12:06:46 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2019-08-13 17:32:19 +0200
commit3e994ff28f867a20ae0dd055a5e4a4a34aad9c3c (patch)
tree18f208210455f94fc40cbfa2b4f284b81f8e3ea5
parentcan: xilinx_can: xcan_rx_fifo_get_next_frame(): fix FSR register FL and RI ma... (diff)
downloadlinux-3e994ff28f867a20ae0dd055a5e4a4a34aad9c3c.tar.xz
linux-3e994ff28f867a20ae0dd055a5e4a4a34aad9c3c.zip
can: xilinx_can: xcan_set_bittiming(): fix the data phase btr1 calculation
While calculating bitrate for the data phase, the driver is using phase segment 1 of the arbitration phase instead of the data phase. Fixes: c223da6 ("can: xilinx_can: Add support for CANFD FD frames") Signed-off-by: Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com> Signed-off-by: Srinivas Neeli <srinivas.neeli@xilinx.com> Acked-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--drivers/net/can/xilinx_can.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index f939f7ac5b64..911b34316c9d 100644
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -425,7 +425,7 @@ static int xcan_set_bittiming(struct net_device *ndev)
btr0 = dbt->brp - 1;
/* Setting Time Segment 1 in BTR Register */
- btr1 = dbt->prop_seg + bt->phase_seg1 - 1;
+ btr1 = dbt->prop_seg + dbt->phase_seg1 - 1;
/* Setting Time Segment 2 in BTR Register */
btr1 |= (dbt->phase_seg2 - 1) << priv->devtype.btr_ts2_shift;