diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2017-11-27 03:18:21 -0500 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2017-12-01 05:26:14 -0500 |
commit | 29c64b17a0bc72232acc45e9533221d88a262efb (patch) | |
tree | eb396345757830d62f2ded5d171c6a59675337bd | |
parent | 658f534c036352a06584c8b2e71a547915173ba9 (diff) |
can: flexcan: fix VF610 state transition issue
Enable FLEXCAN_QUIRK_BROKEN_PERR_STATE for VF610 to report correct state
transitions.
Tested-by: Mirza Krak <mirza.krak@gmail.com>
Cc: linux-stable <stable@vger.kernel.org> # >= v4.11
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | drivers/net/can/flexcan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index eefddae2e99a..0626dcfd1f3d 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c | |||
@@ -189,7 +189,7 @@ | |||
189 | * MX35 FlexCAN2 03.00.00.00 no no no no no | 189 | * MX35 FlexCAN2 03.00.00.00 no no no no no |
190 | * MX53 FlexCAN2 03.00.00.00 yes no no no no | 190 | * MX53 FlexCAN2 03.00.00.00 yes no no no no |
191 | * MX6s FlexCAN3 10.00.12.00 yes yes no no yes | 191 | * MX6s FlexCAN3 10.00.12.00 yes yes no no yes |
192 | * VF610 FlexCAN3 ? no yes ? yes yes? | 192 | * VF610 FlexCAN3 ? no yes no yes yes? |
193 | * | 193 | * |
194 | * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected. | 194 | * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected. |
195 | */ | 195 | */ |
@@ -297,7 +297,8 @@ static const struct flexcan_devtype_data fsl_imx6q_devtype_data = { | |||
297 | 297 | ||
298 | static const struct flexcan_devtype_data fsl_vf610_devtype_data = { | 298 | static const struct flexcan_devtype_data fsl_vf610_devtype_data = { |
299 | .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | | 299 | .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | |
300 | FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP, | 300 | FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | |
301 | FLEXCAN_QUIRK_BROKEN_PERR_STATE, | ||
301 | }; | 302 | }; |
302 | 303 | ||
303 | static const struct can_bittiming_const flexcan_bittiming_const = { | 304 | static const struct can_bittiming_const flexcan_bittiming_const = { |