mtd: denali: Remove device_info_tag structure

[deliverable/linux.git] / drivers / mtd / nand / denali.h

diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
index 626c915294da160775e3bf29c891bfaa2ef110ba..fcac24199d124683ae76f8d73c898426829aaf24 100644 (file)
--- a/drivers/mtd/nand/denali.h
+++ b/drivers/mtd/nand/denali.h
@@ -620,44 +620,6 @@
 #define     MIN_MAX_BANK_7__MIN_VALUE                  0x0003
 #define     MIN_MAX_BANK_7__MAX_VALUE                  0x000c
 
-/* flash.h */
-struct device_info_tag {
-       uint16_t wDeviceMaker;
-       uint16_t wDeviceID;
-       uint8_t  bDeviceParam0;
-       uint8_t  bDeviceParam1;
-       uint8_t  bDeviceParam2;
-       uint32_t wDeviceType;
-       uint32_t wSpectraStartBlock;
-       uint32_t wSpectraEndBlock;
-       uint32_t wTotalBlocks;
-       uint16_t wPagesPerBlock;
-       uint16_t wPageSize;
-       uint16_t wPageDataSize;
-       uint16_t wPageSpareSize;
-       uint16_t wNumPageSpareFlag;
-       uint16_t wECCBytesPerSector;
-       uint32_t wBlockSize;
-       uint32_t wBlockDataSize;
-       uint32_t wDataBlockNum;
-       uint8_t bPlaneNum;
-       uint16_t wDeviceMainAreaSize;
-       uint16_t wDeviceSpareAreaSize;
-       uint16_t wDevicesConnected;
-       uint16_t wDeviceWidth;
-       uint16_t wHWRevision;
-       uint16_t wHWFeatures;
-       uint16_t wONFIDevFeatures;
-       uint16_t wONFIOptCommands;
-       uint16_t wONFITimingMode;
-       uint16_t wONFIPgmCacheTimingMode;
-       uint16_t MLCDevice;
-       uint16_t wSpareSkipBytes;
-       uint8_t nBitsInPageNumber;
-       uint8_t nBitsInPageDataSize;
-       uint8_t nBitsInBlockDataSize;
-};
-
 /* ffsdefs.h */
 #define CLEAR 0                 /*use this to clear a field instead of "fail"*/
 #define SET   1                 /*use this to set a field instead of "pass"*/
@@ -784,7 +746,6 @@ struct nand_buf {
 struct denali_nand_info {
        struct mtd_info mtd;
        struct nand_chip nand;
-       struct device_info_tag dev_info;
        int flash_bank; /* currently selected chip */
        int status;
        int platform;
@@ -802,6 +763,10 @@ struct denali_nand_info {
        uint32_t irq_status;
        int irq_debug_array[32];
        int idx;
+
+       uint32_t fwblks; /* represent how many blocks FW used */
+       uint32_t totalblks;
+       uint32_t blksperchip;
 };
 
 #endif /*_LLD_NAND_*/