Commit 1457998a authored by Joakim Zhang's avatar Joakim Zhang Committed by Marc Kleine-Budde
Browse files

can: flexcan: rename macro FLEXCAN_QUIRK_SETUP_STOP_MODE -> FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR 



This patch intends to rename FLEXCAN_QUIRK_SETUP_STOP_MODE quirk
to FLEXCAN_QUIRK_SETUP_STOP_MODE_GRP for non-scu SoCs, coming patch will
add quirk for scu SoCs.

For non-scu SoCs, setup stop mode with GPR register.
For scu SoCs, setup stop mode with SCU firmware.

Signed-off-by: default avatarJoakim Zhang <qiangqing.zhang@nxp.com>
Link: https://lore.kernel.org/r/20201106105627.31061-4-qiangqing.zhang@nxp.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent cefd754d

drivers/net/can/flexcan.c

+5 −5
Original line number Diff line number Diff line
@@ -236,8 +236,8 @@ 
#define FLEXCAN_QUIRK_BROKEN_PERR_STATE BIT(6)

/* default to BE register access */

#define FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN BIT(7)

/* Setup stop mode to support wakeup */

#define FLEXCAN_QUIRK_SETUP_STOP_MODE BIT(8)

/* Setup stop mode with GPR to support wakeup */

#define FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR BIT(8)

/* Support CAN-FD mode */

#define FLEXCAN_QUIRK_SUPPORT_FD BIT(9)

/* support memory detection and correction */
@@ -381,7 +381,7 @@ static const struct flexcan_devtype_data fsl_imx28_devtype_data = { 
static const struct flexcan_devtype_data fsl_imx6q_devtype_data = {

	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |

		FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | FLEXCAN_QUIRK_BROKEN_PERR_STATE |

		FLEXCAN_QUIRK_SETUP_STOP_MODE,

		FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR,

};



static const struct flexcan_devtype_data fsl_imx8qm_devtype_data = {
@@ -393,7 +393,7 @@ static const struct flexcan_devtype_data fsl_imx8qm_devtype_data = { 
static struct flexcan_devtype_data fsl_imx8mp_devtype_data = {

	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |

		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |

		FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SETUP_STOP_MODE |

		FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR |

		FLEXCAN_QUIRK_SUPPORT_FD | FLEXCAN_QUIRK_SUPPORT_ECC,

};
@@ -2047,7 +2047,7 @@ static int flexcan_probe(struct platform_device *pdev) 
	of_can_transceiver(dev);

	devm_can_led_init(dev);



	if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE) {

	if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR) {

		err = flexcan_setup_stop_mode(pdev);

		if (err)

			dev_dbg(&pdev->dev, "failed to setup stop-mode\n");