can: peak: Add support for new PCIe/M2 CAN FD interfaces

This adds support for the following PEAK-System CAN FD interfaces: PCAN-cPCIe FD CAN FD Interface for cPCI Serial (2 or 4 channels) PCAN-PCIe/104-Express CAN FD Interface for PCIe/104-Express (1, 2 or 4 ch.) PCAN-miniPCIe FD CAN FD Interface for PCIe Mini (1, 2 or 4 channels) PCAN-PCIe FD OEM CAN FD Interface for PCIe OEM version (1, 2 or 4 ch.) PCAN-M.2 CAN FD Interface for M.2 (1 or 2 channels) Like the PCAN-PCIe FD interface, all of these boards run the same IP Core that is able to handle CAN FD (see also http://www.peak-system.com).

Stephane Grosjean committed 9 years ago

Commit 4cbdd0e1 parent 4dcf9241 file · +12 −2Browse files

Unified · Split

drivers/net/can/peak_canfd/peak_pciefd_main.c+12−2

@@ -29,14 +29,19 @@ · 28 unmodified lines
29	29	#include "peak_canfd_user.h"
30	30
31	31	MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
32		−MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe FD family cards");
33		−MODULE_SUPPORTED_DEVICE("PEAK PCAN PCIe FD CAN cards");
	32	+MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe/M.2 FD family cards");
	33	+MODULE_SUPPORTED_DEVICE("PEAK PCAN PCIe/M.2 FD CAN cards");
34	34	MODULE_LICENSE("GPL v2");
35	35
36	36	#define PCIEFD_DRV_NAME "peak_pciefd"
37	37
38	38	#define PEAK_PCI_VENDOR_ID 0x001c /* The PCI device and vendor IDs */
39	39	#define PEAK_PCIEFD_ID 0x0013 /* for PCIe slot cards */
	40	+#define PCAN_CPCIEFD_ID 0x0014 /* for Compact-PCI Serial slot cards */
	41	+#define PCAN_PCIE104FD_ID 0x0017 /* for PCIe-104 Express slot cards */
	42	+#define PCAN_MINIPCIEFD_ID 0x0018 /* for mini-PCIe slot cards */
	43	+#define PCAN_PCIEFD_OEM_ID 0x0019 /* for PCIe slot OEM cards */
	44	+#define PCAN_M2_ID 0x001a /* for M2 slot cards */
40	45
41	46	/* PEAK PCIe board access description */
42	47	#define PCIEFD_BAR0_SIZE (64 * 1024)
@@ -203,6 +208,11 @@ struct pciefd_board { · 160 unmodified lines
203	208	/* supported device ids. */
204	209	static const struct pci_device_id peak_pciefd_tbl[] = {
205	210	{PEAK_PCI_VENDOR_ID, PEAK_PCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},
	211	+ {PEAK_PCI_VENDOR_ID, PCAN_CPCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},
	212	+ {PEAK_PCI_VENDOR_ID, PCAN_PCIE104FD_ID, PCI_ANY_ID, PCI_ANY_ID,},
	213	+ {PEAK_PCI_VENDOR_ID, PCAN_MINIPCIEFD_ID, PCI_ANY_ID, PCI_ANY_ID,},
	214	+ {PEAK_PCI_VENDOR_ID, PCAN_PCIEFD_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,},
	215	+ {PEAK_PCI_VENDOR_ID, PCAN_M2_ID, PCI_ANY_ID, PCI_ANY_ID,},
206	216	{0,}
207	217	};
208	218

can: peak: Add support for new PCIe/M2 CAN FD interfaces

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code