diff options
| author | Anssi Hannula <anssi.hannula@bitwise.fi> | 2018-09-11 14:47:46 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-25 11:36:00 +0800 |
| commit | f6a2c8b3c24af782c94eda629a07016a129b81e4 (patch) | |
| tree | 7afcdf10e1ae3b4fc0177919558fb66392cb5097 | |
| parent | c592b1c3a994bb1fd3e8981a3f4d26a173a47511 (diff) | |
| download | linux-stable-f6a2c8b3c24af782c94eda629a07016a129b81e4.tar.gz linux-stable-f6a2c8b3c24af782c94eda629a07016a129b81e4.tar.bz2 linux-stable-f6a2c8b3c24af782c94eda629a07016a129b81e4.zip | |
can: xilinx_can: use correct bittiming_const for CAN FD core
commit 904044dd8fff43e289c11a2f90fa532e946a1d8b upstream.
Commit 9e5f1b273e6a ("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: 9e5f1b273e6a ("can: xilinx_can: add support for Xilinx CAN FD core")
Reported-by: Shubhrajyoti Datta <shubhrajyoti.datta@gmail.com>
Signed-off-by: Anssi Hannula <anssi.hannula@bitwise.fi>
Cc: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Shubhrajyoti Datta <shubhrajyoti.datta@gmail.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/can/xilinx_can.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c index 045f0845e665..3df23487487f 100644 --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -1424,7 +1424,7 @@ static const struct xcan_devtype_data xcan_canfd_data = { XCAN_FLAG_RXMNF | XCAN_FLAG_TX_MAILBOXES | 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_sjw_shift = XCAN_BTR_SJW_SHIFT_CANFD, .bus_clk_name = "s_axi_aclk", |