diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 10:14:03 (GMT) |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 10:14:03 (GMT) |
| commit | 3cc83f9d08a80fddf4c1e8e766eff8273f30814c (patch) | |
| tree | 831246a1b77d26d0296a84c90684e0fee0368737 /arch/arm/include/asm/arch-at91/sama5d3_smc.h | |
| parent | 64f41212d880f3d00c6994d973aadeec5bda1b65 (diff) | |
| parent | 6dd0e7c00bfa5ce861a72b8e4a3ef9e787306125 (diff) | |
| download | u-boot-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.tar.xz | |
Merge branch 'uboot'
Diffstat (limited to 'arch/arm/include/asm/arch-at91/sama5d3_smc.h')
| -rw-r--r-- | arch/arm/include/asm/arch-at91/sama5d3_smc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-at91/sama5d3_smc.h b/arch/arm/include/asm/arch-at91/sama5d3_smc.h index 6caa9b6..a859b6d 100644 --- a/arch/arm/include/asm/arch-at91/sama5d3_smc.h +++ b/arch/arm/include/asm/arch-at91/sama5d3_smc.h @@ -14,7 +14,8 @@ #define AT91_ASM_SMC_SETUP0 (ATMEL_BASE_SMC + 0x600) #define AT91_ASM_SMC_PULSE0 (ATMEL_BASE_SMC + 0x604) #define AT91_ASM_SMC_CYCLE0 (ATMEL_BASE_SMC + 0x608) -#define AT91_ASM_SMC_MODE0 (ATMEL_BASE_SMC + 0x60C) +#define AT91_ASM_SMC_TIMINGS0 (ATMEL_BASE_SMC + 0x60c) +#define AT91_ASM_SMC_MODE0 (ATMEL_BASE_SMC + 0x610) #else struct at91_cs { u32 setup; /* 0x600 SMC Setup Register */ |