Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit df3c63c

Browse files
stm-at-esdgregkh
authored andcommitted
can: esd_usb: Remove CAN_CTRLMODE_3_SAMPLES for CAN-USB/3-FD
commit 75b3189 upstream. Remove the CAN_CTRLMODE_3_SAMPLES announcement for CAN-USB/3-FD devices because these devices don't support it. The hardware has a Microchip SAM E70 microcontroller that uses a Bosch MCAN IP core as CAN FD controller. But this MCAN core doesn't support triple sampling. Fixes: 80662d9 ("can: esd_usb: Add support for esd CAN-USB/3") Cc: stable@vger.kernel.org Signed-off-by: Stefan Mätje <stefan.maetje@esd.eu> Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr> Link: https://patch.msgid.link/20240904222740.2985864-2-stefan.maetje@esd.eu Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c48f140 commit df3c63c

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/net/can/usb/esd_usb.c

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* CAN driver for esd electronics gmbh CAN-USB/2, CAN-USB/3 and CAN-USB/Micro
44
*
55
* Copyright (C) 2010-2012 esd electronic system design gmbh, Matthias Fuchs <socketcan@esd.eu>
6-
* Copyright (C) 2022-2023 esd electronics gmbh, Frank Jungclaus <frank.jungclaus@esd.eu>
6+
* Copyright (C) 2022-2024 esd electronics gmbh, Frank Jungclaus <frank.jungclaus@esd.eu>
77
*/
88

99
#include <linux/can.h>
@@ -1116,9 +1116,6 @@ static int esd_usb_3_set_bittiming(struct net_device *netdev)
11161116
if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
11171117
flags |= ESD_USB_3_BAUDRATE_FLAG_LOM;
11181118

1119-
if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
1120-
flags |= ESD_USB_3_BAUDRATE_FLAG_TRS;
1121-
11221119
baud_x->nom.brp = cpu_to_le16(nom_bt->brp & (nom_btc->brp_max - 1));
11231120
baud_x->nom.sjw = cpu_to_le16(nom_bt->sjw & (nom_btc->sjw_max - 1));
11241121
baud_x->nom.tseg1 = cpu_to_le16((nom_bt->prop_seg + nom_bt->phase_seg1)
@@ -1219,7 +1216,6 @@ static int esd_usb_probe_one_net(struct usb_interface *intf, int index)
12191216
switch (le16_to_cpu(dev->udev->descriptor.idProduct)) {
12201217
case ESD_USB_CANUSB3_PRODUCT_ID:
12211218
priv->can.clock.freq = ESD_USB_3_CAN_CLOCK;
1222-
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
12231219
priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;
12241220
priv->can.bittiming_const = &esd_usb_3_nom_bittiming_const;
12251221
priv->can.data_bittiming_const = &esd_usb_3_data_bittiming_const;

0 commit comments

Comments
 (0)