diff options
| author | Dong Aisheng <b29396@freescale.com> | 2011-11-02 19:23:31 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 21:04:23 +0800 |
| commit | 594f7f22dcfa72f068c1a999a077e637e14b8622 (patch) | |
| tree | 65c85e3718ec2052cef6a12aaa92442c006d7252 /arch/arm/plat-mxc/include/mach/mx6.h | |
| parent | d85f1321d467d25da4a1023a4e8351faf8f17630 (diff) | |
ENGR00161256-2 mx6q arm2: add flexcan support
Add flexcan support.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mx6.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx6.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx6.h b/arch/arm/plat-mxc/include/mach/mx6.h index 7ad905890ec7..6658138ae14c 100644 --- a/arch/arm/plat-mxc/include/mach/mx6.h +++ b/arch/arm/plat-mxc/include/mach/mx6.h @@ -156,8 +156,8 @@ #define MX6Q_PWM2_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x4000) #define MX6Q_PWM3_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x8000) #define MX6Q_PWM4_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0xC000) -#define CAN1_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x10000) -#define CAN2_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x14000) +#define MX6Q_CAN1_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x10000) +#define MX6Q_CAN2_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x14000) #define GPT_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x18000) #define GPIO1_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x1C000) #define GPIO2_BASE_ADDR (AIPS1_OFF_BASE_ADDR + 0x20000) @@ -389,8 +389,8 @@ #define MXC_INT_INTERRUPT_139_NUM 139 #define MXC_INT_TZASC1 140 #define MXC_INT_TZASC2 141 -#define MXC_INT_CAN1 142 -#define MXC_INT_CAN2 143 +#define MX6Q_INT_CAN1 142 +#define MX6Q_INT_CAN2 143 #define MXC_INT_PERFMON1 144 #define MXC_INT_PERFMON2 145 #define MXC_INT_PERFMON3 146 |