Commit bb698ca4 authored by Wolfgang Grandegger's avatar Wolfgang Grandegger Committed by Marc Kleine-Budde
Browse files

can: flexcan: disable bus error interrupts for the i.MX6q 



This patch adds some Flexcan version info and removes the feature flag
FLEXCAN_HAS_BROKEN_ERR_STATE for the i.MX6Q. It also has the line [TR]WRN_INT
properly connected.

Cc: Hui Wang <jason77.wang@gmail.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarWolfgang Grandegger <wg@grandegger.com>
[mkl: convert to incremental patch]
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 37561f68

drivers/net/can/flexcan.c

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




#define FLEXCAN_MB_CODE_MASK		(0xf0ffffff)

#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_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 */

/* Structure of the message buffer */

struct flexcan_mb {

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_imx28_devtype_data;

static struct flexcan_devtype_data fsl_imx6q_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 = {

static const struct can_bittiming_const flexcan_bittiming_const = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE