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

[u-boot] / include / linux / mtd / fsl_upm.h

diff --git a/include/linux/mtd/fsl_upm.h b/include/linux/mtd/fsl_upm.h
index 638a4e468dedb570c28590365acf4a9fc0f18249..5d7156fac95637490b245cd17e5e6b1bc681a885 100644 (file)
--- a/include/linux/mtd/fsl_upm.h
+++ b/include/linux/mtd/fsl_upm.h
@@ -15,6 +15,10 @@
 
 #include <linux/mtd/nand.h>
 
+#define FSL_UPM_WAIT_RUN_PATTERN  0x1
+#define FSL_UPM_WAIT_WRITE_BYTE   0x2
+#define FSL_UPM_WAIT_WRITE_BUFFER 0x4
+
 struct fsl_upm {
        void __iomem *mdr;
        void __iomem *mxmr;
@@ -28,9 +32,12 @@ struct fsl_upm_nand {
        int width;
        int upm_cmd_offset;
        int upm_addr_offset;
-       int wait_pattern;
-       int (*dev_ready)(void);
+       int upm_mar_chip_offset;
+       int wait_flags;
+       int (*dev_ready)(int chip_nr);
        int chip_delay;
+       int chip_offset;
+       int chip_nr;
 
        /* no need to fill */
        int last_ctrl;