[PATCH RESEND 4/5] can: flexcan: add ISO CAN FD feature support

[Joakim Zhang]

ISO CAN FD is introduced to increase the failture detection capability
than non-ISO CAN FD. The non-ISO CAN FD is still supported by FlexCAN so
that it can be used mainly during an intermediate phase, for evaluation
and development purposes.

Therefore, it is strongly recommended to configure FlexCAN to the ISO
CAN FD protocol by setting the ISOCANFDEN field in the CTRL2 register.

NOTE: if you only set "fd on", driver will use ISO FD MODE by default.

Signed-off-by: Joakim Zhang <qiangqing.zh...@nxp.com>
---
 drivers/net/can/flexcan.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 688bb09b8123..fca014bc530a 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -92,6 +92,7 @@
 #define FLEXCAN_CTRL2_MRP              BIT(18)
 #define FLEXCAN_CTRL2_RRS              BIT(17)
 #define FLEXCAN_CTRL2_EACEN            BIT(16)
+#define FLEXCAN_CTRL2_ISOCANFDEN       BIT(12)
 
 /* FLEXCAN memory error control register (MECR) bits */
 #define FLEXCAN_MECR_ECRWRDIS          BIT(31)
@@ -1254,6 +1255,12 @@ static int flexcan_chip_start(struct net_device *dev)
                priv->write(reg_fdctrl, &regs->fdctrl);
                reg_mcr = priv->read(&regs->mcr);
                priv->write(reg_mcr | FLEXCAN_MCR_FDEN, &regs->mcr);
+
+               reg_ctrl2 = flexcan_read(&regs->ctrl2);
+               if (!(priv->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO))
+                       flexcan_write(reg_ctrl2 | FLEXCAN_CTRL2_ISOCANFDEN, 
&regs->ctrl2);
+               else
+                       flexcan_write(reg_ctrl2 & ~FLEXCAN_CTRL2_ISOCANFDEN, 
&regs->ctrl2);
        }
 
        if ((priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) &&
@@ -1746,7 +1753,7 @@ static int flexcan_probe(struct platform_device *pdev)
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_TIMESTAMP_SUPPORT_FD) {
                if (priv->devtype_data->quirks & 
FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
                        priv->offload.is_canfd = true;
-                       priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;
+                       priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD | 
CAN_CTRLMODE_FD_NON_ISO;
                        priv->can.bittiming_const = &flexcan_fd_bittiming_const;
                        priv->can.data_bittiming_const = 
&flexcan_fd_data_bittiming_const;
                } else {
-- 
2.17.1