OSDN Git Service

can: kvaser_usb: Add new Kvaser hydra devices
authorJimmy Assarsson <extja@kvaser.com>
Thu, 29 Apr 2021 09:37:30 +0000 (11:37 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 27 May 2021 07:42:23 +0000 (09:42 +0200)
Add new Kvaser hydra devices.

Link: https://lore.kernel.org/r/20210429093730.499263-2-extja@kvaser.com
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/usb/Kconfig
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c

index 3deb9f1..f959215 100644 (file)
@@ -76,7 +76,9 @@ config CAN_KVASER_USB
            - Scania VCI2 (if you have the Kvaser logo on top)
            - Kvaser BlackBird v2
            - Kvaser Leaf Pro HS v2
+           - Kvaser Hybrid CAN/LIN
            - Kvaser Hybrid 2xCAN/LIN
+           - Kvaser Hybrid Pro CAN/LIN
            - Kvaser Hybrid Pro 2xCAN/LIN
            - Kvaser Memorator 2xHS v2
            - Kvaser Memorator Pro 2xHS v2
index b2236bf..0cc0fc8 100644 (file)
 #define USB_U100P_PRODUCT_ID                   274
 #define USB_U100S_PRODUCT_ID                   275
 #define USB_USBCAN_PRO_4HS_PRODUCT_ID          276
+#define USB_HYBRID_CANLIN_PRODUCT_ID           277
+#define USB_HYBRID_PRO_CANLIN_PRODUCT_ID       278
 #define USB_HYDRA_PRODUCT_ID_END \
-       USB_USBCAN_PRO_4HS_PRODUCT_ID
+       USB_HYBRID_PRO_CANLIN_PRODUCT_ID
 
 static inline bool kvaser_is_leaf(const struct usb_device_id *id)
 {
@@ -195,6 +197,8 @@ static const struct usb_device_id kvaser_usb_table[] = {
        { USB_DEVICE(KVASER_VENDOR_ID, USB_U100P_PRODUCT_ID) },
        { USB_DEVICE(KVASER_VENDOR_ID, USB_U100S_PRODUCT_ID) },
        { USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_4HS_PRODUCT_ID) },
+       { USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_CANLIN_PRODUCT_ID) },
+       { USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID) },
        { }
 };
 MODULE_DEVICE_TABLE(usb, kvaser_usb_table);