From eea1db3aa5b20c66d49a6afb113c35000d45962e Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 22 Oct 2010 03:11:42 +0000
Subject: [PATCH] --- yaml --- r: 213731 b: refs/heads/master c:
 faf3d9ed2b9b402aa2c3d11688c6a1ff80ea6ea4 h: refs/heads/master i:   213729:
 e86b0e3b1cabf31aa9e869d77a536529af250176   213727:
 970d3f25d5a8a2d4ac03a417d463d3ea010ed37f v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/blackfin/include/asm/bfin_can.h | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ceaa11ab5457..d46f31012dcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d868212c411b0e3d11006f58688b31ee2180d8c
+refs/heads/master: faf3d9ed2b9b402aa2c3d11688c6a1ff80ea6ea4
diff --git a/trunk/arch/blackfin/include/asm/bfin_can.h b/trunk/arch/blackfin/include/asm/bfin_can.h
index eec0076a385b..b1492e0bcabb 100644
--- a/trunk/arch/blackfin/include/asm/bfin_can.h
+++ b/trunk/arch/blackfin/include/asm/bfin_can.h
@@ -34,6 +34,7 @@ struct bfin_can_mask_regs {
 };
 
 struct bfin_can_channel_regs {
+	/* data[0,2,4,6] -> data{0,1,2,3} while data[1,3,5,7] is padding */
 	u16 data[8];
 	__BFP(dlc);
 	__BFP(tsv);
@@ -83,16 +84,18 @@ struct bfin_can_regs {
 	__BFP(gif);           /* offset 0x9c */
 	__BFP(control);       /* offset 0xa0 */
 	__BFP(intr);          /* offset 0xa4 */
-	u32 __pad3[1];
+	__BFP(version);       /* offset 0xa8 */
 	__BFP(mbtd);          /* offset 0xac */
 	__BFP(ewr);           /* offset 0xb0 */
 	__BFP(esr);           /* offset 0xb4 */
-	u32 __pad4[2];
+	u32 __pad3[2];
 	__BFP(ucreg);         /* offset 0xc0 */
 	__BFP(uccnt);         /* offset 0xc4 */
 	__BFP(ucrc);          /* offset 0xc8 */
 	__BFP(uccnf);         /* offset 0xcc */
-	u32 __pad5[12];
+	u32 __pad4[1];
+	__BFP(version2);      /* offset 0xd4 */
+	u32 __pad5[10];
 
 	/*
 	 * channel(mailbox) mask and message registers