linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Jimmy Assarsson <extja@kvaser.com>,
	Marc Kleine-Budde <mkl@pengutronix.de>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.11 11/45] can: kvaser_usb: Add support for USBcan Pro 4xHS
Date: Fri,  9 Apr 2021 11:53:37 +0200	[thread overview]
Message-ID: <20210409095305.757553521@linuxfoundation.org> (raw)
In-Reply-To: <20210409095305.397149021@linuxfoundation.org>

From: Jimmy Assarsson <extja@kvaser.com>

[ Upstream commit 7507479c46b120c37ef83e59be7683a526e98e1a ]

Add support for Kvaser USBcan Pro 4xHS.

Link: https://lore.kernel.org/r/20210309091724.31262-2-jimmyassarsson@gmail.com
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/can/usb/Kconfig                      | 1 +
 drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
index c1e5d5b570b6..538f4d9adb91 100644
--- a/drivers/net/can/usb/Kconfig
+++ b/drivers/net/can/usb/Kconfig
@@ -73,6 +73,7 @@ config CAN_KVASER_USB
 	    - Kvaser Memorator Pro 5xHS
 	    - Kvaser USBcan Light 4xHS
 	    - Kvaser USBcan Pro 2xHS v2
+	    - Kvaser USBcan Pro 4xHS
 	    - Kvaser USBcan Pro 5xHS
 	    - Kvaser U100
 	    - Kvaser U100P
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
index e2d58846c40c..073c4a39e718 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
@@ -86,8 +86,9 @@
 #define USB_U100_PRODUCT_ID			273
 #define USB_U100P_PRODUCT_ID			274
 #define USB_U100S_PRODUCT_ID			275
+#define USB_USBCAN_PRO_4HS_PRODUCT_ID		276
 #define USB_HYDRA_PRODUCT_ID_END \
-	USB_U100S_PRODUCT_ID
+	USB_USBCAN_PRO_4HS_PRODUCT_ID
 
 static inline bool kvaser_is_leaf(const struct usb_device_id *id)
 {
@@ -193,6 +194,7 @@ static const struct usb_device_id kvaser_usb_table[] = {
 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_U100_PRODUCT_ID) },
 	{ 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) },
 	{ }
 };
 MODULE_DEVICE_TABLE(usb, kvaser_usb_table);
-- 
2.30.2




  parent reply	other threads:[~2021-04-09 10:10 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-09  9:53 [PATCH 5.11 00/45] 5.11.13-rc1 review Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 01/45] ARM: dts: am33xx: add aliases for mmc interfaces Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 02/45] bus: ti-sysc: Fix warning on unbind if reset is not deasserted Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 03/45] drm/msm: a6xx: Make sure the SQE microcode is safe Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 04/45] platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2 Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 05/45] bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 06/45] net/mlx5e: Enforce minimum value check for ICOSQ size Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 07/45] net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 08/45] kunit: tool: Fix a python tuple typing error Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 09/45] mISDN: fix crash in fritzpci Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 10/45] net: arcnet: com20020 fix error handling Greg Kroah-Hartman
2021-04-09  9:53 ` Greg Kroah-Hartman [this message]
2021-04-09  9:53 ` [PATCH 5.11 12/45] mac80211: Check crypto_aead_encrypt for errors Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 13/45] mac80211: choose first enabled channel for monitor Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 14/45] drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 15/45] drm/msm/adreno: a5xx_power: Dont apply A540 lm_setup to other GPUs Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 16/45] drm/msm: Ratelimit invalid-fence message Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 17/45] netfilter: conntrack: Fix gre tunneling over ipv6 Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 18/45] netfilter: nftables: skip hook overlap logic if flowtable is stale Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 19/45] net: ipa: fix init header command validation Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 20/45] platform/x86: thinkpad_acpi: Allow the FnLock LED to change state Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 21/45] kselftest/arm64: sve: Do not use non-canonical FFR register value Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 22/45] drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 23/45] x86/build: Turn off -fcf-protection for realmode targets Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 24/45] block: clear GD_NEED_PART_SCAN later in bdev_disk_changed Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 25/45] platform/x86: intel_pmt_class: Initial resource to 0 Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 26/45] platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 27/45] ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 28/45] scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 29/45] arm64: kernel: disable CNP on Carmel Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 30/45] selftests/vm: fix out-of-tree build Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 31/45] ia64: mca: allocate early mca with GFP_ATOMIC Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 32/45] ia64: fix format strings for err_inject Greg Kroah-Hartman
2021-04-09  9:53 ` [PATCH 5.11 33/45] cifs: revalidate mapping when we open files for SMB1 POSIX Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 34/45] cifs: Silently ignore unknown oplock break handle Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 35/45] io_uring: fix timeout cancel return code Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 36/45] math: Export mul_u64_u64_div_u64 Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 37/45] tools/resolve_btfids: Build libbpf and libsubcmd in separate directories Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 38/45] tools/resolve_btfids: Check objects before removing Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 39/45] tools/resolve_btfids: Set srctree variable unconditionally Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 40/45] kbuild: Add resolve_btfids clean to root clean target Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 41/45] kbuild: Do not clean resolve_btfids if the output does not exist Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 42/45] tools/resolve_btfids: Add /libbpf to .gitignore Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 43/45] bpf, x86: Validate computation of branch displacements for x86-64 Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 44/45] bpf, x86: Validate computation of branch displacements for x86-32 Greg Kroah-Hartman
2021-04-09  9:54 ` [PATCH 5.11 45/45] init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Greg Kroah-Hartman
2021-04-09 20:14 ` [PATCH 5.11 00/45] 5.11.13-rc1 review Guenter Roeck
2021-04-09 20:38 ` Shuah Khan
2021-04-10  6:26 ` Naresh Kamboju

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210409095305.757553521@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=extja@kvaser.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mkl@pengutronix.de \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).