All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wolfgang Grandegger <wg@grandegger.com>
To: "Xenomai@xenomai.org" <Xenomai@xenomai.org>
Cc: Jonathan Bohren <jbo@jhu.edu>
Subject: [Xenomai] [PATCH] rtcan: Adding device ID for PEAK PCIe card IPEH-003027
Date: Tue, 04 Dec 2012 16:16:38 +0100	[thread overview]
Message-ID: <50BE13D6.3070408@grandegger.com> (raw)


Signed-off-by: Jonathan Bohren <jbo@jhu.edu>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>

---

HI Gilles,

second try to the right ml. Could you please apply this patch. It looks
good from my point of view.

Thanks,

Wolfgang.

 ksrc/drivers/can/sja1000/rtcan_peak_pci.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ksrc/drivers/can/sja1000/rtcan_peak_pci.c b/ksrc/drivers/can/sja1000/rtcan_peak_pci.c
index 53c8fef..b5ad226 100644
--- a/ksrc/drivers/can/sja1000/rtcan_peak_pci.c
+++ b/ksrc/drivers/can/sja1000/rtcan_peak_pci.c
@@ -71,13 +71,15 @@ struct rtcan_peak_pci
 #define PITA_MISC        0x1C        // miscellanoes register
 
 #define PEAK_PCI_VENDOR_ID   0x001C  // the PCI device and vendor IDs
-#define PEAK_PCI_DEVICE_ID   0x0001
+#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 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},
 	{ }
 };
 MODULE_DEVICE_TABLE (pci, peak_pci_tbl);
-- 
1.7.9.5


             reply	other threads:[~2012-12-04 15:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-04 15:16 Wolfgang Grandegger [this message]
2012-12-08 12:30 ` [Xenomai] [PATCH] rtcan: Adding device ID for PEAK PCIe card IPEH-003027 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=50BE13D6.3070408@grandegger.com \
    --to=wg@grandegger.com \
    --cc=Xenomai@xenomai.org \
    --cc=jbo@jhu.edu \
    /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.