Commit fb78cdbb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-can 



Marc Kleine-Budde says:

====================
here are two patches for the v3.7 release cycle. A patch by Wolfgang Grandegger
for the flexcan driver, which switches off a workaround on the imx6q that is
not needed, because the hardware is not affected by that bug. And a patch by
Stephane Grosjean which updates the pci device table for the peak pci sja1000
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 14edd87d fc09e367

drivers/net/can/flexcan.c

+16 −3
Original line number Diff line number Diff line
@@ -144,9 +144,22 @@ 


#define FLEXCAN_MB_CODE_MASK		(0xf0ffffff)



/* FLEXCAN hardware feature flags */

/*

 * FLEXCAN hardware feature flags

 *

 * Below is some version info we got:

 *    SOC   Version   IP-Version  Glitch-  [TR]WRN_INT

 *                                Filter?   connected?

 *   MX25  FlexCAN2  03.00.00.00     no         no

 *   MX28  FlexCAN2  03.00.04.00    yes        yes

 *   MX35  FlexCAN2  03.00.00.00     no         no

 *   MX53  FlexCAN2  03.00.00.00    yes         no

 *   MX6s  FlexCAN3  10.00.12.00    yes        yes

 *

 * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected.

 */

#define FLEXCAN_HAS_V10_FEATURES	BIT(1) /* For core version >= 10 */

#define FLEXCAN_HAS_BROKEN_ERR_STATE	BIT(2) /* Broken error state handling */

#define FLEXCAN_HAS_BROKEN_ERR_STATE	BIT(2) /* [TR]WRN_INT not connected */



/* Structure of the message buffer */

struct flexcan_mb {
@@ -205,7 +218,7 @@ static struct flexcan_devtype_data fsl_p1010_devtype_data = { 
};

static struct flexcan_devtype_data fsl_imx28_devtype_data;

static struct flexcan_devtype_data fsl_imx6q_devtype_data = {

	.features = FLEXCAN_HAS_V10_FEATURES | FLEXCAN_HAS_BROKEN_ERR_STATE,

	.features = FLEXCAN_HAS_V10_FEATURES,

};



static const struct can_bittiming_const flexcan_bittiming_const = {

drivers/net/can/sja1000/peak_pci.c

+11 −2
Original line number Diff line number Diff line
@@ -30,9 +30,10 @@ 


#include "sja1000.h"



MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>");

MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");

MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI family cards");

MODULE_SUPPORTED_DEVICE("PEAK PCAN PCI/PCIe/PCIeC miniPCI CAN cards");

MODULE_SUPPORTED_DEVICE("PEAK PCAN miniPCIe/cPCI PC/104+ PCI/104e CAN Cards");

MODULE_LICENSE("GPL v2");



#define DRV_NAME  "peak_pci"
@@ -64,7 +65,11 @@ struct peak_pci_chan { 
#define PEAK_PCI_DEVICE_ID	0x0001	/* for PCI/PCIe slot cards */

#define PEAK_PCIEC_DEVICE_ID	0x0002	/* for ExpressCard slot cards */

#define PEAK_PCIE_DEVICE_ID	0x0003	/* for nextgen PCIe slot cards */

#define PEAK_MPCI_DEVICE_ID	0x0008	/* The miniPCI slot cards */

#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 PEAK_PCI_CHAN_MAX	4
@@ -76,6 +81,10 @@ static DEFINE_PCI_DEVICE_TABLE(peak_pci_tbl) = { 
	{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,},

#ifdef CONFIG_CAN_PEAK_PCIEC

	{PEAK_PCI_VENDOR_ID, PEAK_PCIEC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE