Merge git://git.denx.de/u-boot-sunxi

[u-boot] / drivers / mtd / nand / denali.h

diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
index db1457a680eef809e282f2175c52ea5b3d99c803..08db48843da357ee1ef0412e7a9e5a200b70c4c8 100644 (file)
--- a/drivers/mtd/nand/denali.h
+++ b/drivers/mtd/nand/denali.h
@@ -166,8 +166,6 @@
 
 #define REVISION                               0x370
 #define     REVISION__VALUE                            0xffff
-#define MAKE_COMPARABLE_REVISION(x)            swab16((x) & REVISION__VALUE)
-#define REVISION_5_1                           0x00000501
 
 #define ONFI_DEVICE_FEATURES                   0x380
 #define     ONFI_DEVICE_FEATURES__VALUE                        0x003f
@@ -436,7 +434,6 @@ struct nand_buf {
 #define DT             3
 
 struct denali_nand_info {
-       struct mtd_info *mtd;
        struct nand_chip nand;
        int flash_bank; /* currently selected chip */
        int status;
@@ -463,6 +460,13 @@ struct denali_nand_info {
        uint32_t blksperchip;
        uint32_t bbtskipbytes;
        uint32_t max_banks;
+       unsigned int revision;
+       unsigned int caps;
 };
 
+#define DENALI_CAP_HW_ECC_FIXUP                        BIT(0)
+#define DENALI_CAP_DMA_64BIT                   BIT(1)
+
+int denali_init(struct denali_nand_info *denali);
+
 #endif /* __DENALI_H__ */