plx_pci: sync with net-next-2.6

This patch makes the plx_pci driver in the BerliOS repo same as in
net-next-2.6

Changes since previous revision (1120):
- Added some defines for static inline int plx_pci_check_sja1000(...)
- static struct pci_device_id plx_pci_tbl[] replaced by
  static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl)
- Typo fixed
- Changed order of device info to have the PCI devices in alphabetical
  order

From net-next-2.6 commit 24c4a3b29255f9f8bc48d93597a58256b5a1f83f

Signed-off-by: Pavel Cheblakov <P.B.Cheblakov@inp.nsk.su>
git-svn-id: svn://svn.berlios.de//socketcan/trunk@1125 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/sja1000/Kconfig b/kernel/2.6/drivers/net/can/sja1000/Kconfig
index 5c80960530c06fe3964c0b1212c97fc0d4d0fe7a..5276e33d1837693f69d8a18bc0f526f585d40070 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/Kconfig
+++ b/kernel/2.6/drivers/net/can/sja1000/Kconfig
@@ -83,14 +83,14 @@ config CAN_PEAK_PCI
 
 config CAN_PLX_PCI
        tristate "PLX90xx PCI-bridge based Cards"
-       depends on PCI && CAN_SJA1000
+       depends on PCI
        ---help---
          This driver is for CAN interface cards based on
          the PLX90xx PCI bridge.
          Driver supports now:
-          - Marathon CAN-bus-PCI card (http://www.marathon.ru/)
           - Adlink PCI-7841/cPCI-7841 card (http://www.adlinktech.com/)
           - Adlink PCI-7841/cPCI-7841 SE card
+          - Marathon CAN-bus-PCI card (http://www.marathon.ru/)
           - TEWS TECHNOLOGIES TPMC810 card (http://www.tews.com/)
 
 config CAN_PIPCAN

diff --git a/kernel/2.6/drivers/net/can/sja1000/plx_pci.c b/kernel/2.6/drivers/net/can/sja1000/plx_pci.c
index 63f8c2cc224d8babd9b0d7d6350468eac6211cb3..b8169440801361f7cf1b3974255f6603c80c1397 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/plx_pci.c
+++ b/kernel/2.6/drivers/net/can/sja1000/plx_pci.c
@@ -6,7 +6,6 @@
  *     Copyright (C) 2008 Markus Plessing <plessing@ems-wuensche.com>
  *     Copyright (C) 2008 Sebastian Haas <haas@ems-wuensche.com>
  *
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the version 2 of the GNU General Public License
  * as published by the Free Software Foundation
@@ -40,11 +39,11 @@
 #define DRV_NAME  "sja1000_plx_pci"
 
 MODULE_AUTHOR("Pavel Cheblakov <P.B.Cheblakov@inp.nsk.su>");
-MODULE_DESCRIPTION("Socket-CAN driver for the PLX90xx PCI-bridge cards with "
-                  "SJA1000 chips");
-MODULE_SUPPORTED_DEVICE("Marathon CAN-bus-PCI, "
-                       "Adlink PCI-7841/cPCI-7841, "
+MODULE_DESCRIPTION("Socket-CAN driver for PLX90xx PCI-bridge cards with "
+                  "the SJA1000 chips");
+MODULE_SUPPORTED_DEVICE("Adlink PCI-7841/cPCI-7841, "
                        "Adlink PCI-7841/cPCI-7841 SE, "
+                       "Marathon CAN-bus-PCI, "
                        "TEWS TECHNOLOGIES TPMC810");
 MODULE_LICENSE("GPL v2");
 
@@ -58,10 +57,8 @@ struct plx_pci_card {
 
 #define PLX_PCI_CAN_CLOCK (16000000 / 2)
 
-/*
- * the PLX90xx registers
- */
-#define PLX_INTCSR     0x4c            /* Interrup Control/Status */
+/* PLX90xx registers */
+#define PLX_INTCSR     0x4c            /* Interrupt Control/Status */
 #define PLX_CNTRL      0x50            /* User I/O, Direct Slave Response,
                                         * Serial EEPROM, and Initialization
                                         * Control register
@@ -90,6 +87,20 @@ struct plx_pci_card {
  */
 #define PLX_PCI_CDR                    (CDR_CBP | CDR_CLKOUT_MASK)
 
+/* SJA1000 Control Register in the BasicCAN Mode */
+#define REG_CR                         0x00
+
+/* States of some SJA1000 registers after hardware reset in the BasicCAN mode*/
+#define REG_CR_BASICCAN_INITIAL                0x21
+#define REG_CR_BASICCAN_INITIAL_MASK   0xa1
+#define REG_SR_BASICCAN_INITIAL                0x0c
+#define REG_IR_BASICCAN_INITIAL                0xe0
+
+/* States of some SJA1000 registers after hardware reset in the PeliCAN mode*/
+#define REG_MOD_PELICAN_INITIAL                0x01
+#define REG_SR_PELICAN_INITIAL         0x3c
+#define REG_IR_PELICAN_INITIAL         0x00
+
 #define ADLINK_PCI_VENDOR_ID           0x144A
 #define ADLINK_PCI_DEVICE_ID           0x7841
 
@@ -124,14 +135,6 @@ struct plx_pci_card_info {
        void (*reset_func)(struct pci_dev *pdev);
 };
 
-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,
-       {0, 0x00, 0x00}, { {2, 0x00, 0x00}, {4, 0x00, 0x00} },
-       &plx_pci_reset_marathon
-       /* based on PLX9052 */
-};
-
 static struct plx_pci_card_info plx_pci_card_info_adlink __devinitdata = {
        "Adlink PCI-7841/cPCI-7841", 2,
        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
@@ -148,6 +151,14 @@ static struct plx_pci_card_info plx_pci_card_info_adlink_se __devinitdata = {
        /* based on PLX9052 */
 };
 
+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,
+       {0, 0x00, 0x00}, { {2, 0x00, 0x00}, {4, 0x00, 0x00} },
+       &plx_pci_reset_marathon
+       /* based on PLX9052 */
+};
+
 static struct plx_pci_card_info plx_pci_card_info_tews __devinitdata = {
        "TEWS TECHNOLOGIES TPMC810", 2,
        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
@@ -156,14 +167,7 @@ static struct plx_pci_card_info plx_pci_card_info_tews __devinitdata = {
        /* based on PLX9030 */
 };
 
-static struct pci_device_id plx_pci_tbl[] = {
-       {
-               /* Marathon CAN-bus-PCI card */
-               PCI_VENDOR_ID_PLX, MARATHON_PCI_DEVICE_ID,
-               PCI_ANY_ID, PCI_ANY_ID,
-               0, 0,
-               (kernel_ulong_t)&plx_pci_card_info_marathon
-       },
+static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl) = {
        {
                /* Adlink PCI-7841/cPCI-7841 */
                ADLINK_PCI_VENDOR_ID, ADLINK_PCI_DEVICE_ID,
@@ -178,6 +182,13 @@ static struct pci_device_id plx_pci_tbl[] = {
                PCI_CLASS_COMMUNICATION_OTHER << 8, ~0,
                (kernel_ulong_t)&plx_pci_card_info_adlink_se
        },
+       {
+               /* Marathon CAN-bus-PCI card */
+               PCI_VENDOR_ID_PLX, MARATHON_PCI_DEVICE_ID,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0,
+               (kernel_ulong_t)&plx_pci_card_info_marathon
+       },
        {
                /* TEWS TECHNOLOGIES TPMC810 card */
                TEWS_PCI_VENDOR_ID, TEWS_PCI_DEVICE_ID_TMPC810,
@@ -212,9 +223,10 @@ static inline int plx_pci_check_sja1000(const struct sja1000_priv *priv)
         * Check registers after hardware reset (the Basic mode)
         * See states on p. 10 of the Datasheet.
         */
-       if ((priv->read_reg(priv, REG_MOD) & 0xa1) == 0x21 &&
-           (priv->read_reg(priv, REG_SR) == 0x0c) &&
-           (priv->read_reg(priv, REG_IR) == 0xe0))
+       if ((priv->read_reg(priv, REG_CR) & REG_CR_BASICCAN_INITIAL_MASK) ==
+           REG_CR_BASICCAN_INITIAL &&
+           (priv->read_reg(priv, REG_SR) == REG_SR_BASICCAN_INITIAL) &&
+           (priv->read_reg(priv, REG_IR) == REG_IR_BASICCAN_INITIAL))
                flag = 1;
 
        /* Bring the SJA1000 into the PeliCAN mode*/
@@ -224,16 +236,16 @@ static inline int plx_pci_check_sja1000(const struct sja1000_priv *priv)
         * Check registers after reset in the PeliCAN mode.
         * See states on p. 23 of the Datasheet.
         */
-       if ((priv->read_reg(priv, REG_MOD) & 0xf1) == 0x01 &&
-           (priv->read_reg(priv, REG_SR) & 0x37) == 0x34 &&
-           (priv->read_reg(priv, REG_IR) & 0xfb) == 0x00)
+       if (priv->read_reg(priv, REG_MOD) == REG_MOD_PELICAN_INITIAL &&
+           priv->read_reg(priv, REG_SR) == REG_SR_PELICAN_INITIAL &&
+           priv->read_reg(priv, REG_IR) == REG_IR_PELICAN_INITIAL)
                return flag;
 
        return 0;
 }
 
 /*
- * The PLX90xx software reset
+ * PLX90xx software reset
  * Also LRESET# asserts and brings to reset device on the Local Bus (if wired).
  * For most cards it's enough for reset the SJA1000 chips.
  */
@@ -311,7 +323,7 @@ static void plx_pci_del_card(struct pci_dev *pdev)
 }
 
 /*
- * Probe the PLX90xx based device for the SJA1000 chips and register each
+ * Probe PLX90xx based device for the SJA1000 chips and register each
  * available CAN channel to SJA1000 Socket-CAN subsystem.
  */
 static int __devinit plx_pci_add_card(struct pci_dev *pdev,
@@ -347,7 +359,7 @@ static int __devinit plx_pci_add_card(struct pci_dev *pdev,
 
        card->channels = 0;
 
-       /* Remap the PLX90xx configuration space */
+       /* Remap PLX90xx configuration space */
        addr = pci_iomap(pdev, ci->conf_map.bar, ci->conf_map.size);
        if (!addr) {
                err = -ENOMEM;
@@ -466,4 +478,3 @@ static void __exit plx_pci_exit(void)
 
 module_init(plx_pci_init);
 module_exit(plx_pci_exit);
-