1c6476e03ac867d1079bed3a519a9a6d52044f1e
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 802-can-0020-can-flexcan-add-CAN-FD-BRS-support.patch
1 From 4c26434ac773e37f30ee5a8fa6f7275fe7dabac2 Mon Sep 17 00:00:00 2001
2 From: Joakim Zhang <qiangqing.zhang@nxp.com>
3 Date: Fri, 12 Jul 2019 08:02:47 +0000
4 Subject: [PATCH] can: flexcan: add CAN FD BRS support
5
6 This patch adds CAN FD BitRate Switch (BRS) support to driver.
7
8 Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
9 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
10 ---
11 drivers/net/can/flexcan.c | 9 ++++++++-
12 1 file changed, 8 insertions(+), 1 deletion(-)
13
14 --- a/drivers/net/can/flexcan.c
15 +++ b/drivers/net/can/flexcan.c
16 @@ -704,9 +704,13 @@ static netdev_tx_t flexcan_start_xmit(st
17 if (cfd->can_id & CAN_RTR_FLAG)
18 ctrl |= FLEXCAN_MB_CNT_RTR;
19
20 - if (can_is_canfd_skb(skb))
21 + if (can_is_canfd_skb(skb)) {
22 ctrl |= FLEXCAN_MB_CNT_EDL;
23
24 + if (cfd->flags & CANFD_BRS)
25 + ctrl |= FLEXCAN_MB_CNT_BRS;
26 + }
27 +
28 for (i = 0; i < cfd->len; i += sizeof(u32)) {
29 data = be32_to_cpup((__be32 *)&cfd->data[i]);
30 priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
31 @@ -937,6 +941,9 @@ static struct sk_buff *flexcan_mailbox_r
32
33 if (reg_ctrl & FLEXCAN_MB_CNT_EDL) {
34 cfd->len = can_dlc2len(get_canfd_dlc((reg_ctrl >> 16) & 0xf));
35 +
36 + if (reg_ctrl & FLEXCAN_MB_CNT_BRS)
37 + cfd->flags |= CANFD_BRS;
38 } else {
39 cfd->len = get_can_dlc((reg_ctrl >> 16) & 0xf);
40