summaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2018-08-17 14:52:58 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2018-11-28 16:51:43 +0100
commitc982a3ca49e330aeb5d8b8446e7bc60c9191080d (patch)
treefe45c3fc730a3f211ddaebd06ccfea575c3efb94 /drivers/net/can
parentcan: flexcan: FLEXCAN_IFLAG_MB: add () around macro argument (diff)
downloadlinux-c982a3ca49e330aeb5d8b8446e7bc60c9191080d.tar.xz
linux-c982a3ca49e330aeb5d8b8446e7bc60c9191080d.zip
can: flexcan: flexcan_chip_start(): adjust comment to match the code
With the conversion of the flexcan driver to support both timestamp and FIFO mode the setup of the MCR register ("enable fifo") has been moved. This patch moves the comment too, in order to match the code again. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/flexcan.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 7085eb329cf8..e57a152266d7 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -935,7 +935,6 @@ static int flexcan_chip_start(struct net_device *dev)
/* MCR
*
* enable freeze
- * enable fifo
* halt now
* only supervisor access
* enable warning int
@@ -950,6 +949,12 @@ static int flexcan_chip_start(struct net_device *dev)
FLEXCAN_MCR_WRN_EN | FLEXCAN_MCR_SRX_DIS | FLEXCAN_MCR_IRMQ |
FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_MAXMB(FLEXCAN_TX_MB);
+ /* MCR
+ *
+ * FIFO:
+ * - disable for timestamp mode
+ * - enable for FIFO mode
+ */
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP)
reg_mcr &= ~FLEXCAN_MCR_FEN;
else