All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wolfgang Grandegger <wg@grandegger.com>
To: "Xenomai@xenomai.org" <Xenomai@xenomai.org>
Cc: "Daniel M. Drucker, Ph.D." <dmd@interactive-motion.com>
Subject: [Xenomai] [PATCH] rtcan/peak_pci: add further device ids to the PCI device, table
Date: Mon, 15 Apr 2013 09:03:55 +0200	[thread overview]
Message-ID: <516BA65B.5000908@grandegger.com> (raw)

Add support for further PEAK CAN PCI cards. We have confirmation that
the miniPCIe card with the device id 8 works fine. But 4 channels cards
are still not fully supported.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>

---
 ksrc/drivers/can/sja1000/rtcan_peak_pci.c |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/ksrc/drivers/can/sja1000/rtcan_peak_pci.c b/ksrc/drivers/can/sja1000/rtcan_peak_pci.c
index a19b917..d13a7ff 100644
--- a/ksrc/drivers/can/sja1000/rtcan_peak_pci.c
+++ b/ksrc/drivers/can/sja1000/rtcan_peak_pci.c
@@ -70,16 +70,26 @@ struct rtcan_peak_pci
 #define PITA_GPIOICR     0x18        // general purpose IO interface control register
 #define PITA_MISC        0x1C        // miscellanoes register
 
-#define PEAK_PCI_VENDOR_ID   0x001C  // the PCI device and vendor IDs
-#define PEAK_PCI_DEVICE_ID   0x0001  // Device ID for PCI and older PCIe cards
-#define PEAK_PCIE_DEVICE_ID  0x0003  // Device ID for newer PCIe cards (IPEH-003027)
+#define PEAK_PCI_VENDOR_ID      0x001C  // the PCI device and vendor IDs
+#define PEAK_PCI_DEVICE_ID      0x0001  // Device ID for PCI and older PCIe cards
+#define PEAK_PCIE_DEVICE_ID     0x0003  // Device ID for newer PCIe cards (IPEH-003027)
+#define PEAK_CPCI_DEVICE_ID     0x0004  // for nextgen cPCI slot cards
+#define PEAK_MPCI_DEVICE_ID     0x0005  // for nextgen miniPCI slot cards
+#define PEAK_PC_104P_DEVICE_ID  0x0006  // PCAN-PC/104+ cards
+#define PEAK_PCI_104E_DEVICE_ID 0x0007  // PCAN-PCI/104 Express cards
+#define PEAK_MPCIE_DEVICE_ID    0x0008  // The miniPCIe slot cards
 
 #define PCI_CONFIG_PORT_SIZE 0x1000  // size of the config io-memory
 #define PCI_PORT_SIZE        0x0400  // size of a channel io-memory
 
 static struct pci_device_id peak_pci_tbl[] = {
-	{PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_MPCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_PC_104P_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_PCI_104E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_CPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
 	{ }
 };
 MODULE_DEVICE_TABLE (pci, peak_pci_tbl);
-- 
1.7.9.5



             reply	other threads:[~2013-04-15  7:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-15  7:03 Wolfgang Grandegger [this message]
2013-04-15  7:06 ` [Xenomai] [PATCH] rtcan/peak_pci: add further device ids to the PCI device, table Gilles Chanteperdrix

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=516BA65B.5000908@grandegger.com \
    --to=wg@grandegger.com \
    --cc=Xenomai@xenomai.org \
    --cc=dmd@interactive-motion.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.