From: Marc Kleine-Budde <mkl@pengutronix.de>
To: davem@davemloft.net
Cc: Netdev@vger.kernel.org, kernel@pengutronix.de,
mkl@blackshift.org, linux-can@vger.kernel.org,
James Kime <kime@ixxat.de>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 5/9] can: plx_pci: add support for IXXAT PCI cards
Date: Fri, 3 Feb 2012 01:51:54 +0100 [thread overview]
Message-ID: <1328230318-8962-6-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1328230318-8962-1-git-send-email-mkl@pengutronix.de>
From: James Kime <kime@ixxat.de>
This patch adds support for IXXAT passive CAN controllers
Signed-off-by: James Kime <kime@ixxat.de>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/sja1000/Kconfig | 1 +
drivers/net/can/sja1000/plx_pci.c | 22 +++++++++++++++++++++-
2 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index 36e9d59..b21523d 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -71,6 +71,7 @@ config CAN_PLX_PCI
- esd CAN-PCIe/2000
- Marathon CAN-bus-PCI card (http://www.marathon.ru/)
- TEWS TECHNOLOGIES TPMC810 card (http://www.tews.com/)
+ - IXXAT Automation PC-I 04/PCI card (http://www.ixxat.com/)
config CAN_TSCAN1
tristate "TS-CAN1 PC104 boards"
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index c7f3d4e..a227586 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -43,7 +43,8 @@ MODULE_SUPPORTED_DEVICE("Adlink PCI-7841/cPCI-7841, "
"TEWS TECHNOLOGIES TPMC810, "
"esd CAN-PCI/CPCI/PCI104/200, "
"esd CAN-PCI/PMC/266, "
- "esd CAN-PCIe/2000")
+ "esd CAN-PCIe/2000, "
+ "IXXAT PC-I 04/PCI")
MODULE_LICENSE("GPL v2");
#define PLX_PCI_MAX_CHAN 2
@@ -121,6 +122,10 @@ struct plx_pci_card {
#define ESD_PCI_SUB_SYS_ID_PCIE2000 0x0200
#define ESD_PCI_SUB_SYS_ID_PCI104200 0x0501
+#define IXXAT_PCI_VENDOR_ID 0x10b5
+#define IXXAT_PCI_DEVICE_ID 0x9050
+#define IXXAT_PCI_SUB_SYS_ID 0x2540
+
#define MARATHON_PCI_DEVICE_ID 0x2715
#define TEWS_PCI_VENDOR_ID 0x1498
@@ -193,6 +198,14 @@ static struct plx_pci_card_info plx_pci_card_info_esd2000 __devinitdata = {
/* based on PEX8311 */
};
+static struct plx_pci_card_info plx_pci_card_info_ixxat __devinitdata = {
+ "IXXAT PC-I 04/PCI", 2,
+ PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
+ {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x200, 0x80} },
+ &plx_pci_reset_common
+ /* based on PLX9050 */
+};
+
static struct plx_pci_card_info plx_pci_card_info_marathon __devinitdata = {
"Marathon CAN-bus-PCI", 2,
PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
@@ -267,6 +280,13 @@ static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl) = {
(kernel_ulong_t)&plx_pci_card_info_esd2000
},
{
+ /* IXXAT PC-I 04/PCI card */
+ IXXAT_PCI_VENDOR_ID, IXXAT_PCI_DEVICE_ID,
+ PCI_ANY_ID, IXXAT_PCI_SUB_SYS_ID,
+ 0, 0,
+ (kernel_ulong_t)&plx_pci_card_info_ixxat
+ },
+ {
/* Marathon CAN-bus-PCI card */
PCI_VENDOR_ID_PLX, MARATHON_PCI_DEVICE_ID,
PCI_ANY_ID, PCI_ANY_ID,
--
1.7.4.1
next prev parent reply other threads:[~2012-02-03 0:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 0:51 [PATCH 0/9] can: driver updates Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 1/9] can: ems_usb: Removed double netif_device_detach Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 2/9] can: dev: let can_get_echo_skb() return dlc of CAN frame Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 3/9] can: flexcan: Fix CAN_RAW_RECV_OWN_MSGS and CAN_RAW_LOOPBACK Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 4/9] can: ems_usb: Improved memory handling on ems_usb_start Marc Kleine-Budde
2012-02-03 0:51 ` Marc Kleine-Budde [this message]
2012-02-03 0:51 ` [PATCH 6/9] can: pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 7/9] can: Kconfig: add more information about Intel EG20T PCH CAN controller Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 8/9] can: bfin_can/ti_hecc/mscan: add missing do_get_berr_counter callback Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 9/9] can: replace the dev_dbg/info/err/... with the new netdev_xxx macros Marc Kleine-Budde
2012-02-04 21:44 ` [PATCH 0/9] can: driver updates David Miller
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=1328230318-8962-6-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=Netdev@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kime@ixxat.de \
--cc=linux-can@vger.kernel.org \
--cc=mkl@blackshift.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).