Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 749de6fc authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: flexcan: flexcan_chip_start(): cleanup writing of reg_mcr 



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: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 8c411745

drivers/net/can/flexcan.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -838,15 +838,15 @@ static int flexcan_chip_start(struct net_device *dev) 
	 * halt now

	 * halt now

	 * only supervisor access

	 * only supervisor access

	 * enable warning int

	 * enable warning int

	 * choose format C

	 * disable local echo

	 * disable local echo

	 * choose format C

	 * set max mailbox number

	 */

	 */

	reg_mcr = flexcan_read(&regs->mcr);

	reg_mcr = flexcan_read(&regs->mcr);

	reg_mcr &= ~FLEXCAN_MCR_MAXMB(0xff);

	reg_mcr &= ~FLEXCAN_MCR_MAXMB(0xff);

	reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_FEN | FLEXCAN_MCR_HALT |

	reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_FEN | FLEXCAN_MCR_HALT |

		FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN |

		FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN | FLEXCAN_MCR_SRX_DIS |

		FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_SRX_DIS |

		FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_MAXMB(FLEXCAN_TX_BUF_ID);

		FLEXCAN_MCR_MAXMB(FLEXCAN_TX_BUF_ID);

	netdev_dbg(dev, "%s: writing mcr=0x%08x", __func__, reg_mcr);

	netdev_dbg(dev, "%s: writing mcr=0x%08x", __func__, reg_mcr);

	flexcan_write(reg_mcr, &regs->mcr);

	flexcan_write(reg_mcr, &regs->mcr);