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

Commit 71873a9b authored by Jimmy Assarsson's avatar Jimmy Assarsson Committed by Marc Kleine-Budde
Browse files

can: kvaser_usb: Add support for more Kvaser Leaf v2 devices 



This patch adds support for Kvaser Leaf Light HS v2 OEM, Mini PCI
Express 2xHS and USBcan Light 2xHS.

Signed-off-by: default avatarJimmy Assarsson <jimmyassarsson@gmail.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 25e1ed6e

drivers/net/can/usb/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ config CAN_KVASER_USB 
	    - Kvaser USBcan R

	    - Kvaser Leaf Light v2

	    - Kvaser Mini PCI Express HS

	    - Kvaser Mini PCI Express 2xHS

	    - Kvaser USBcan Light 2xHS

	    - Kvaser USBcan II HS/HS

	    - Kvaser USBcan II HS/LS

	    - Kvaser USBcan Rugged ("USBcan Rev B")

drivers/net/can/usb/kvaser_usb.c

+7 −1
Original line number Diff line number Diff line
@@ -59,11 +59,14 @@ 
#define USB_CAN_R_PRODUCT_ID		39

#define USB_LEAF_LITE_V2_PRODUCT_ID	288

#define USB_MINI_PCIE_HS_PRODUCT_ID	289

#define USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID 290

#define USB_USBCAN_LIGHT_2HS_PRODUCT_ID	291

#define USB_MINI_PCIE_2HS_PRODUCT_ID	292



static inline bool kvaser_is_leaf(const struct usb_device_id *id)

{

	return id->idProduct >= USB_LEAF_DEVEL_PRODUCT_ID &&

	       id->idProduct <= USB_MINI_PCIE_HS_PRODUCT_ID;

	       id->idProduct <= USB_MINI_PCIE_2HS_PRODUCT_ID;

}



/* Kvaser USBCan-II devices */
@@ -537,6 +540,9 @@ static const struct usb_device_id kvaser_usb_table[] = { 
		.driver_info = KVASER_HAS_TXRX_ERRORS },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID) },



	/* USBCANII family IDs */

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN2_PRODUCT_ID),