Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / arch / arm / include / asm / arch-at91 / sama5d3_smc.h

diff --git a/arch/arm/include/asm/arch-at91/sama5d3_smc.h b/arch/arm/include/asm/arch-at91/sama5d3_smc.h
index c060894f14b371f3e5f9945e6a62b41696f7e5cc..a859b6db9b78a1b85af72ca888c9df06190edf03 100644 (file)
--- a/arch/arm/include/asm/arch-at91/sama5d3_smc.h
+++ b/arch/arm/include/asm/arch-at91/sama5d3_smc.h
@@ -14,10 +14,10 @@
 #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     reserved[96];
        u32     setup;          /* 0x600 SMC Setup Register */
        u32     pulse;          /* 0x604 SMC Pulse Register */
        u32     cycle;          /* 0x608 SMC Cycle Register */
@@ -26,6 +26,7 @@ struct at91_cs {
 };
 
 struct at91_smc {
+       u32 reserved[384];
        struct at91_cs cs[4];
 };
 #endif /*  __ASSEMBLY__ */