Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / arm / mach-davinci / include / mach / nand.h

diff --git a/arch/arm/mach-davinci/include/mach/nand.h b/arch/arm/mach-davinci/include/mach/nand.h
index b2ad8090bd1058b86367c19456a3a0ef42d57efb..025151049f0517a103c4efb96ee86d465c3fff19 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/nand.h
+++ b/arch/arm/mach-davinci/include/mach/nand.h
@@ -30,9 +30,6 @@
 
 #include <linux/mtd/nand.h>
 
-#define NRCSR_OFFSET           0x00
-#define AWCCR_OFFSET           0x04
-#define A1CR_OFFSET            0x10
 #define NANDFCR_OFFSET         0x60
 #define NANDFSR_OFFSET         0x64
 #define NANDF1ECC_OFFSET       0x70
@@ -83,6 +80,9 @@ struct davinci_nand_pdata {           /* platform_data */
        /* Main and mirror bbt descriptor overrides */
        struct nand_bbt_descr   *bbt_td;
        struct nand_bbt_descr   *bbt_md;
+
+       /* Access timings */
+       struct davinci_aemif_timing     *timing;
 };
 
 #endif /* __ARCH_ARM_DAVINCI_NAND_H */