Commit cea846cc authored by Marc Kleine-Budde's avatar Marc Kleine-Budde

Merge patch series "can: kvaser_usb: Add support for three new devices"

Martin Jocic <martin.jocic@kvaser.com> says:

This patch series adds support for the following devices:
* Vining 800
* Kvaser USBcan Pro 5xCAN
* Kvaser Mini PCIe 1xCAN

Link: https://lore.kernel.org/all/20240612141946.3352364-1-martin.jocic@kvaser.comSigned-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parents f9f608e3 0135c4c6
...@@ -91,6 +91,7 @@ config CAN_KVASER_USB ...@@ -91,6 +91,7 @@ config CAN_KVASER_USB
- Kvaser Leaf Light R v2 - Kvaser Leaf Light R v2
- Kvaser Mini PCI Express HS - Kvaser Mini PCI Express HS
- Kvaser Mini PCI Express 2xHS - Kvaser Mini PCI Express 2xHS
- Kvaser Mini PCIe 1xCAN
- Kvaser USBcan Light 2xHS - Kvaser USBcan Light 2xHS
- Kvaser USBcan II HS/HS - Kvaser USBcan II HS/HS
- Kvaser USBcan II HS/LS - Kvaser USBcan II HS/LS
...@@ -111,12 +112,14 @@ config CAN_KVASER_USB ...@@ -111,12 +112,14 @@ config CAN_KVASER_USB
- Kvaser USBcan Light 4xHS - Kvaser USBcan Light 4xHS
- Kvaser USBcan Pro 2xHS v2 - Kvaser USBcan Pro 2xHS v2
- Kvaser USBcan Pro 4xHS - Kvaser USBcan Pro 4xHS
- Kvaser USBcan Pro 5xCAN
- Kvaser USBcan Pro 5xHS - Kvaser USBcan Pro 5xHS
- Kvaser U100 - Kvaser U100
- Kvaser U100P - Kvaser U100P
- Kvaser U100S - Kvaser U100S
- ATI Memorator Pro 2xHS v2 - ATI Memorator Pro 2xHS v2
- ATI USBcan Pro 2xHS v2 - ATI USBcan Pro 2xHS v2
- Vining 800
If unsure, say N. If unsure, say N.
......
...@@ -89,6 +89,9 @@ ...@@ -89,6 +89,9 @@
#define USB_HYBRID_CANLIN_PRODUCT_ID 0x0115 #define USB_HYBRID_CANLIN_PRODUCT_ID 0x0115
#define USB_HYBRID_PRO_CANLIN_PRODUCT_ID 0x0116 #define USB_HYBRID_PRO_CANLIN_PRODUCT_ID 0x0116
#define USB_LEAF_V3_PRODUCT_ID 0x0117 #define USB_LEAF_V3_PRODUCT_ID 0x0117
#define USB_VINING_800_PRODUCT_ID 0x0119
#define USB_USBCAN_PRO_5XCAN_PRODUCT_ID 0x011A
#define USB_MINI_PCIE_1XCAN_PRODUCT_ID 0x011B
static const struct kvaser_usb_driver_info kvaser_usb_driver_info_hydra = { static const struct kvaser_usb_driver_info kvaser_usb_driver_info_hydra = {
.quirks = KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP, .quirks = KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP,
...@@ -238,6 +241,12 @@ static const struct usb_device_id kvaser_usb_table[] = { ...@@ -238,6 +241,12 @@ static const struct usb_device_id kvaser_usb_table[] = {
.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra }, .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_V3_PRODUCT_ID), { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_V3_PRODUCT_ID),
.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra }, .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_VINING_800_PRODUCT_ID),
.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_5XCAN_PRODUCT_ID),
.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_1XCAN_PRODUCT_ID),
.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
{ } { }
}; };
MODULE_DEVICE_TABLE(usb, kvaser_usb_table); MODULE_DEVICE_TABLE(usb, kvaser_usb_table);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment