Commit 2e2e23c3 authored by Anssi Hannula's avatar Anssi Hannula Committed by Greg Kroah-Hartman

can: xilinx_can: use correct bittiming_const for CAN FD core

commit 904044dd upstream.

Commit 9e5f1b27 ("can: xilinx_can: add support for Xilinx CAN FD
core") added a new can_bittiming_const structure for CAN FD cores that
support larger values for tseg1, tseg2, and sjw than previous Xilinx CAN
cores, but the commit did not actually take that into use.

Fix that.

Tested with CAN FD core on a ZynqMP board.

Fixes: 9e5f1b27 ("can: xilinx_can: add support for Xilinx CAN FD core")
Reported-by: default avatarShubhrajyoti Datta <shubhrajyoti.datta@gmail.com>
Signed-off-by: default avatarAnssi Hannula <anssi.hannula@bitwise.fi>
Cc: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: default avatarShubhrajyoti Datta <shubhrajyoti.datta@gmail.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e15e6f7
...@@ -1443,7 +1443,7 @@ static const struct xcan_devtype_data xcan_canfd_data = { ...@@ -1443,7 +1443,7 @@ static const struct xcan_devtype_data xcan_canfd_data = {
XCAN_FLAG_RXMNF | XCAN_FLAG_RXMNF |
XCAN_FLAG_TX_MAILBOXES | XCAN_FLAG_TX_MAILBOXES |
XCAN_FLAG_RX_FIFO_MULTI, XCAN_FLAG_RX_FIFO_MULTI,
.bittiming_const = &xcan_bittiming_const, .bittiming_const = &xcan_bittiming_const_canfd,
.btr_ts2_shift = XCAN_BTR_TS2_SHIFT_CANFD, .btr_ts2_shift = XCAN_BTR_TS2_SHIFT_CANFD,
.btr_sjw_shift = XCAN_BTR_SJW_SHIFT_CANFD, .btr_sjw_shift = XCAN_BTR_SJW_SHIFT_CANFD,
.bus_clk_name = "s_axi_aclk", .bus_clk_name = "s_axi_aclk",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment