diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-11-29 00:03:10 +0000 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-11-29 00:03:10 +0000 |
| commit | 103e40f6330306753ba11548d53ff25144216236 (patch) | |
| tree | daf0e38e82ccc8fabbc314adcddd6ed93602ade9 /include | |
| parent | 95b93a0cd46682c6d9e8eea803fda510cb6b863a (diff) | |
| parent | f4f91ac3c833abbd7181ff2122c6b48a653b4e55 (diff) | |
| download | linux-103e40f6330306753ba11548d53ff25144216236.tar.gz linux-103e40f6330306753ba11548d53ff25144216236.tar.bz2 linux-103e40f6330306753ba11548d53ff25144216236.zip | |
Merge git://git.infradead.org/~kmpark/onenand-mtd-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/onenand.h | 5 | ||||
| -rw-r--r-- | include/linux/mtd/onenand_regs.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h index 6f045b586e76..62ca0f429822 100644 --- a/include/linux/mtd/onenand.h +++ b/include/linux/mtd/onenand.h @@ -13,6 +13,7 @@ #define __LINUX_MTD_ONENAND_H #include <linux/spinlock.h> +#include <linux/completion.h> #include <linux/mtd/onenand_regs.h> #include <linux/mtd/bbm.h> @@ -33,7 +34,6 @@ typedef enum { FL_WRITING, FL_ERASING, FL_SYNCING, - FL_UNLOCKING, FL_LOCKING, FL_RESETING, FL_OTPING, @@ -120,6 +120,9 @@ struct onenand_chip { int (*block_markbad)(struct mtd_info *mtd, loff_t ofs); int (*scan_bbt)(struct mtd_info *mtd); + struct completion complete; + int irq; + spinlock_t chip_lock; wait_queue_head_t wq; onenand_state_t state; diff --git a/include/linux/mtd/onenand_regs.h b/include/linux/mtd/onenand_regs.h index 9e409fe6ded6..e31c8f5d4271 100644 --- a/include/linux/mtd/onenand_regs.h +++ b/include/linux/mtd/onenand_regs.h @@ -179,6 +179,7 @@ * ECC Status Reigser FF00h (R) */ #define ONENAND_ECC_1BIT (1 << 0) +#define ONENAND_ECC_1BIT_ALL (0x5555) #define ONENAND_ECC_2BIT (1 << 1) #define ONENAND_ECC_2BIT_ALL (0xAAAA) |