linux-can.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: linux-can@vger.kernel.org, kernel@pengutronix.de,
	david@protonic.nl, Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 04/12] can: flexcan: flexcan_chip_start(): cleanup writing of reg_mcr
Date: Tue,  1 Sep 2015 11:29:07 +0200	[thread overview]
Message-ID: <1441099755-8601-5-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1441099755-8601-1-git-send-email-mkl@pengutronix.de>

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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 83ea6f4f7164..70cdbfcebb46 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -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);
 
-- 
2.5.0


  parent reply	other threads:[~2015-09-01  9:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-01  9:29 [PATCH 00/12] RFC: cleanup flexcan driver, introduce and make use of IRQ offloading Marc Kleine-Budde
2015-09-01  9:29 ` [PATCH 01/12] can: headers: make header files self contained Marc Kleine-Budde
2015-09-01  9:29 ` [PATCH 02/12] can: flexcan: cleanup coding style and fix typos Marc Kleine-Budde
2015-09-01  9:29 ` [PATCH 03/12] can: flexcan: remove unused header files Marc Kleine-Budde
2015-09-01  9:29 ` Marc Kleine-Budde [this message]
2015-09-01  9:29 ` [PATCH 05/12] can: flexcan: rename feature into quirks Marc Kleine-Budde
2015-09-01  9:29 ` [PATCH 06/12] can: flexcan: use pointer to struct regs instead of void pointer for mmio address space Marc Kleine-Budde
2015-09-01  9:29 ` [PATCH 07/12] can: flexcan: give member of flexcan_priv holding mailboxes a sensible name Marc Kleine-Budde
2015-09-01  9:29 ` [PATCH 08/12] can: flexcan: enable interrupts atomically at the end of flexcan_chip_start() Marc Kleine-Budde
2015-09-01  9:29 ` [PATCH 09/12] can: flexcan: calculate default value for imask1 during runtime Marc Kleine-Budde
2015-09-01  9:29 ` [PATCH 10/12] can: flexcan: make TX mailbox selectable " Marc Kleine-Budde
2015-09-01  9:29 ` [PATCH 11/12] can: rx-fifo: Add support for simple irq offloading Marc Kleine-Budde
2015-09-01  9:29 ` [PATCH 12/12] can: flexcan: make use of rx-fifos's irq_offload_simple Marc Kleine-Budde
     [not found]   ` <CAOpc7mGfu7kT9qTNOC1P-_=7cRicscoLzqKpPE1kMx1HkueCwA@mail.gmail.com>
2015-12-10 12:21     ` Marc Kleine-Budde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1441099755-8601-5-git-send-email-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=david@protonic.nl \
    --cc=kernel@pengutronix.de \
    --cc=linux-can@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).