Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3c5ea60 authored by Stephane Grosjean's avatar Stephane Grosjean Committed by Marc Kleine-Budde
Browse files

can: peak_usb: export ctrlmode_supported to adapter specific definition 



Export the ctrlmode_supported value from the core file to each adapter specific
file. This has been mandatory for supporting the new CANFD extension.

Signed-off-by: default avatarStephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent d6b5f30d

drivers/net/can/usb/peak_usb/pcan_usb.c

+1 −0
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ const struct peak_usb_adapter pcan_usb = { 
	.name = "PCAN-USB",

	.device_id = PCAN_USB_PRODUCT_ID,

	.ctrl_count = 1,

	.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,

	.clock = {

		.freq = PCAN_USB_CRYSTAL_HZ / 2 ,

	},

drivers/net/can/usb/peak_usb/pcan_usb_core.c

+1 −2
Original line number Diff line number Diff line
@@ -750,8 +750,7 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter, 
	dev->can.bittiming_const = &peak_usb_adapter->bittiming_const;

	dev->can.do_set_bittiming = peak_usb_set_bittiming;

	dev->can.do_set_mode = peak_usb_set_mode;

	dev->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |

				      CAN_CTRLMODE_LISTENONLY;

	dev->can.ctrlmode_supported = peak_usb_adapter->ctrlmode_supported;



	netdev->netdev_ops = &peak_usb_netdev_ops;

drivers/net/can/usb/peak_usb/pcan_usb_core.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct peak_usb_device; 
struct peak_usb_adapter {

	char *name;

	u32 device_id;

	u32 ctrlmode_supported;

	struct can_clock clock;

	const struct can_bittiming_const bittiming_const;

	unsigned int ctrl_count;

drivers/net/can/usb/peak_usb/pcan_usb_pro.c

+1 −0
Original line number Diff line number Diff line
@@ -1016,6 +1016,7 @@ const struct peak_usb_adapter pcan_usb_pro = { 
	.name = "PCAN-USB Pro",

	.device_id = PCAN_USBPRO_PRODUCT_ID,

	.ctrl_count = PCAN_USBPRO_CHANNEL_COUNT,

	.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,

	.clock = {

		.freq = PCAN_USBPRO_CRYSTAL_HZ,

	},