From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-can@vger.kernel.org
Cc: kernel@pengutronix.de, bhupesh.sharma@freescale.com,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH v2 05/11] can: flexcan: add missing register definitions
Date: Thu, 10 Dec 2015 13:33:51 +0100 [thread overview]
Message-ID: <1449750837-11376-6-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1449750837-11376-1-git-send-email-mkl@pengutronix.de>
This patch adds some missing register definitions, which are needed in an
upcoming patch.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/flexcan.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index bddd2ef904f0..ef4693b970f4 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -56,7 +56,7 @@
#define FLEXCAN_MCR_WAK_SRC BIT(19)
#define FLEXCAN_MCR_DOZE BIT(18)
#define FLEXCAN_MCR_SRX_DIS BIT(17)
-#define FLEXCAN_MCR_BCC BIT(16)
+#define FLEXCAN_MCR_IRMQ BIT(16)
#define FLEXCAN_MCR_LPRIO_EN BIT(13)
#define FLEXCAN_MCR_AEN BIT(12)
#define FLEXCAN_MCR_MAXMB(x) ((x) & 0x7f)
@@ -211,7 +211,10 @@ struct flexcan_regs {
u32 imask1; /* 0x28 */
u32 iflag2; /* 0x2c */
u32 iflag1; /* 0x30 */
- u32 ctrl2; /* 0x34 */
+ union { /* 0x34 */
+ u32 gfwr_mx28; /* MX28, MX53 */
+ u32 ctrl2; /* MX6, VF610 */
+ };
u32 esr2; /* 0x38 */
u32 imeur; /* 0x3c */
u32 lrfr; /* 0x40 */
@@ -230,7 +233,11 @@ struct flexcan_regs {
* size conf'ed via ctrl2::RFFN
* (mx6, vf610)
*/
- u32 _reserved4[408];
+ u32 _reserved4[256]; /* 0x480 */
+ u32 rximr[64]; /* 0x880 */
+ u32 _reserved5[24]; /* 0x980 */
+ u32 gfwr_mx6; /* 0x9e0 - MX6 */
+ u32 _reserved6[63]; /* 0x9e4 */
u32 mecr; /* 0xae0 */
u32 erriar; /* 0xae4 */
u32 erridpr; /* 0xae8 */
--
2.6.2
next prev parent reply other threads:[~2015-12-10 12:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-10 12:33 [PATCH v2 00/11] RFC: cleanup flexcan driver, introduce and make use of IRQ offloading Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 01/11] can: flexcan: calculate default value for imask1 during runtime Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 02/11] can: flexcan: make TX mailbox selectable " Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 03/11] can: rx-fifo: Add support for simple irq offloading Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 04/11] can: flexcan: make use of rx-fifo's irq_offload_simple Marc Kleine-Budde
2015-12-10 12:33 ` Marc Kleine-Budde [this message]
2015-12-10 12:33 ` [PATCH v2 06/11] can: flexcan: activate individual RX masking and initialize reg_rximr Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 07/11] can: flexcan: add quirk FLEXCAN_QUIRK_ENABLE_EACEN_RRS Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 08/11] can: flexcan: reg_imask2_default Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 09/11] can: rx-fifo: introduce software rx-fifo implementation Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 10/11] can: flexcan: add support for rx-fifo based software FIFO implementation Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 11/11] can: flexcan: switch imx6 and vf610 to software based fifo Marc Kleine-Budde
[not found] ` <CAOpc7mGK9WEnbowHJONbP-szW7mVQbU46uUPXF8V09omqWLQMA@mail.gmail.com>
2015-12-10 14:04 ` [PATCH v2 00/11] RFC: cleanup flexcan driver, introduce and make use of IRQ offloading Marc Kleine-Budde
2016-01-18 11:14 ` Holger Schurig
2016-01-18 22:04 ` Marc Kleine-Budde
2016-01-19 0:26 ` Tom Evans
2016-02-22 15:16 ` Mirza Krak
2016-02-22 15:19 ` 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=1449750837-11376-6-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=bhupesh.sharma@freescale.com \
--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).