aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/can/flexcan.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 4c873fbe661f..3a370d8437b0 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -190,6 +190,7 @@
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 ? yes yes?
193 * LS1021A FlexCAN2 03.00.04.00 no yes no no yes
193 * 194 *
194 * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected. 195 * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected.
195 */ 196 */
@@ -304,6 +305,12 @@ static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
304 FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP, 305 FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
305}; 306};
306 307
308static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = {
309 .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
310 FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE |
311 FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
312};
313
307static const struct can_bittiming_const flexcan_bittiming_const = { 314static const struct can_bittiming_const flexcan_bittiming_const = {
308 .name = DRV_NAME, 315 .name = DRV_NAME,
309 .tseg1_min = 4, 316 .tseg1_min = 4,
@@ -1248,6 +1255,7 @@ static const struct of_device_id flexcan_of_match[] = {
1248 { .compatible = "fsl,imx25-flexcan", .data = &fsl_p1010_devtype_data, }, 1255 { .compatible = "fsl,imx25-flexcan", .data = &fsl_p1010_devtype_data, },
1249 { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, }, 1256 { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
1250 { .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, }, 1257 { .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
1258 { .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },
1251 { /* sentinel */ }, 1259 { /* sentinel */ },
1252}; 1260};
1253MODULE_DEVICE_TABLE(of, flexcan_of_match); 1261MODULE_DEVICE_TABLE(of, flexcan_of_match);