]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
can: flexcan: flexcan_chip_start(): cleanup writing of reg_mcr
authorMarc Kleine-Budde <mkl@pengutronix.de>
Mon, 31 Aug 2015 19:32:34 +0000 (21:32 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Mon, 21 Sep 2015 06:38:22 +0000 (08:38 +0200)
This patch changes the order the individual bits of the mcr register in
flexcan_chip_start() are or'ed together to match the datasheet. The inline
documentation is adjusted accordingly.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/flexcan.c

index 83ea6f4f7164c679baad259398884b22df8daf74..70cdbfcebb46c2d3556e67a941828dea5a5fdf6b 100644 (file)
@@ -838,15 +838,15 @@ static int flexcan_chip_start(struct net_device *dev)
         * halt now
         * only supervisor access
         * enable warning int
-        * choose format C
         * disable local echo
+        * choose format C
+        * set max mailbox number
         */
        reg_mcr = flexcan_read(&regs->mcr);
        reg_mcr &= ~FLEXCAN_MCR_MAXMB(0xff);
        reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_FEN | FLEXCAN_MCR_HALT |
-               FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN |
-               FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_SRX_DIS |
-               FLEXCAN_MCR_MAXMB(FLEXCAN_TX_BUF_ID);
+               FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN | FLEXCAN_MCR_SRX_DIS |
+               FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_MAXMB(FLEXCAN_TX_BUF_ID);
        netdev_dbg(dev, "%s: writing mcr=0x%08x", __func__, reg_mcr);
        flexcan_write(reg_mcr, &regs->mcr);