From e8038bb9e812adc5cb09604381c93dca362e2c63 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 22 Jul 2010 11:41:56 +0200 Subject: [PATCH] --- yaml --- r: 201673 b: refs/heads/master c: c3f6a34605db2771886b8eaf1cdf8e8ca3e8350d h: refs/heads/master i: 201671: 16386f0857c002db05ac7aeb80fe1ce907c7dd1f v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/include/mach/mx25.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 07a97a469368..bd05b68dc9de 100644 --- 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 index 11b044f5b10f..4a6f800990f8 100644 --- 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