---

yaml --- r: 201673 b: refs/heads/master c: c3f6a34 h: refs/heads/master i: 201671: 16386f0 v: v3
git-mirror · Jul 26, 2010 · e8038bb · e8038bb
1 parent 66c8108
commit e8038bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e993ade18fcc5f81b26ec031c166880789a9723b
+refs/heads/master: c3f6a34605db2771886b8eaf1cdf8e8ca3e8350d
diff --git a/trunk/arch/arm/plat-mxc/include/mach/mx25.h b/trunk/arch/arm/plat-mxc/include/mach/mx25.h
@@ -13,6 +13,8 @@
 
 #define MX25_I2C1_BASE_ADDR		(MX25_AIPS1_BASE_ADDR + 0x80000)
 #define MX25_I2C3_BASE_ADDR		(MX25_AIPS1_BASE_ADDR + 0x84000)
+#define MX25_CAN1_BASE_ADDR		(MX25_AIPS1_BASE_ADDR + 0x88000)
+#define MX25_CAN2_BASE_ADDR		(MX25_AIPS1_BASE_ADDR + 0x8c000)
 #define MX25_I2C2_BASE_ADDR		(MX25_AIPS1_BASE_ADDR + 0x98000)
 #define MX25_CSPI1_BASE_ADDR		(MX25_AIPS1_BASE_ADDR + 0xa4000)
 #define MX25_IOMUXC_BASE_ADDR		(MX25_AIPS1_BASE_ADDR + 0xac000)
@@ -70,6 +72,8 @@
 #define MX25_INT_NANDFC		33
 #define MX25_INT_LCDC		39
 #define MX25_INT_UART5		40
+#define MX25_INT_CAN1		43
+#define MX25_INT_CAN2		44
 #define MX25_INT_UART1		45
 #define MX25_INT_FEC		57