Pavel B. Cheblakov wrote: > From: Pavel Cheblakov <[email protected]> > > It's a next version of sja1000_plx_pci driver. > In struct plx_pci_card_info pointer to device-dependent reset function was > added. It's necessary for special reset operations which take place in > some cards (like Marathon CAN-bus-PCI). > Also, I've introduced a special reset function for Marathon card. This > function incapsulates ability to reset the SJA1000 on such cards. > > plx_pci_check_sja1000 was slightly modified for a purpose of exhaustive > checking. > > Signed-off-by: Pavel Cheblakov <[email protected]> > ---
Looks good now. I have applied the patch to SVN trunk with some minor modifications... > Index: Makefile > =================================================================== > --- Makefile (.../vendor/socketcan/1095/kernel/2.6) (revision 210) > +++ Makefile (.../socketcan/trunk/kernel/2.6) (revision 210) > @@ -16,6 +16,7 @@ export CONFIG_CAN_SJA1000_PLATFORM=m > #export CONFIG_CAN_SJA1000_OF_PLATFORM=m > export CONFIG_CAN_ESD_PCI=m > export CONFIG_CAN_IXXAT_PCI=m > +export CONFIG_CAN_PLX_PCI=m Line moved down to have the PCI devices in alphabetical order. > export CONFIG_CAN_PEAK_PCI=m > export CONFIG_CAN_KVASER_PCI=m > export CONFIG_CAN_EMS_PCI=m [snip] > Index: drivers/net/can/sja1000/Kconfig > =================================================================== > --- drivers/net/can/sja1000/Kconfig (.../vendor/socketcan/1095/kernel/2.6) > (revision 210) > +++ drivers/net/can/sja1000/Kconfig (.../socketcan/trunk/kernel/2.6) > (revision 210) > @@ -67,6 +67,18 @@ config CAN_IXXAT_PCI > This driver is for the IXXAT PC-I 04/PCI card (1 or 2 channel) > from the IXXAT Automation GmbH (http://www.ixxat.de). > > +config CAN_PLX_PCI > + tristate "The PLX90xx PCI-bridge based Cards" Removed "The". > + depends on PCI && CAN_SJA1000 > + ---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 > + - TEWS TECHNOLOGIES TPMC810 card (http://www.tews.com/) > + Line moved down to have the PCI devices in alphabetical order. Please check the commit. Would be nice if you post this patch for kernel inclusion as well. I have sent a README on how to do it recently. Thanks for your contribution. Wolfgang _______________________________________________ Socketcan-core mailing list [email protected] https://lists.berlios.de/mailman/listinfo/socketcan-core
