]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
can: flexcan: add missing register definitions
authorMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 27 Aug 2015 14:01:27 +0000 (16:01 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Mon, 6 Feb 2017 14:13:27 +0000 (15:13 +0100)
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

index 43cfce8b076b72ffa4e184c458d8ee2d0fe7bdd3..74909e599f31af451da6fc5f60ad9ff010cd7f5e 100644 (file)
@@ -55,7 +55,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)
@@ -213,7 +213,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 */
@@ -232,7 +235,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 */