From d438d50848e9425286e5fb0493e0affb5a0b1e1b Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Wed, 13 Aug 2008 09:11:02 +0900 Subject: Fix OneNAND build break Since page size field is changed from oobblock to writesize. But OneNAND is not updated. - fix bufferram management at erase operation This patch includes the NAND/OneNAND state filed too. Signed-off-by: Kyungmin Park Signed-off-by: Scott Wood --- include/linux/mtd/onenand.h | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'include/linux/mtd/onenand.h') diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h index 4b0c2dfaaaa..8a0fd0de97e 100644 --- a/include/linux/mtd/onenand.h +++ b/include/linux/mtd/onenand.h @@ -17,6 +17,7 @@ /* Note: The header order is impoertant */ #include +#include #include #define MAX_BUFFERRAM 2 @@ -27,20 +28,6 @@ extern int onenand_scan (struct mtd_info *mtd, int max_chips); /* Free resources held by the OneNAND device */ extern void onenand_release (struct mtd_info *mtd); -/** - * onenand_state_t - chip states - * Enumeration for OneNAND flash chip state - */ -typedef enum { - FL_READY, - FL_READING, - FL_WRITING, - FL_ERASING, - FL_SYNCING, - FL_UNLOCKING, - FL_LOCKING, -} onenand_state_t; - /** * struct onenand_bufferram - OneNAND BufferRAM Data * @param block block address in BufferRAM @@ -103,10 +90,12 @@ struct onenand_chip { unsigned short (*read_word) (void __iomem * addr); void (*write_word) (unsigned short value, void __iomem * addr); void (*mmcontrol) (struct mtd_info * mtd, int sync_read); + int (*block_markbad)(struct mtd_info *mtd, loff_t ofs); + int (*scan_bbt)(struct mtd_info *mtd); spinlock_t chip_lock; wait_queue_head_t wq; - onenand_state_t state; + int state; struct nand_oobinfo *autooob; -- cgit v1.2.3