diff options
| author | Alessandro Rubini <rubini@unipv.it> | 2009-09-21 01:28:14 +0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-24 23:55:07 +0400 |
| commit | 30631cb82d5c6c662d5ec682beaa834c1f9f0987 (patch) | |
| tree | 9c329ebf759cdbc4be4cc488ae448bbb6ef73c11 /include/linux/mtd/flashchip.h | |
| parent | c62d81bcfe82526cc3da10cf4fc63faad368bc60 (diff) | |
| download | linux-30631cb82d5c6c662d5ec682beaa834c1f9f0987.tar.xz | |
mtd: unify status enum from three headers
nand.h, onenand.h and flashchip.h defined enumeration types
for chip status using the same symbolic names. This prevented
a board file to include more than one of them. In particular,
no nand and onenand platform devices could live in the same file.
This patch augments flashchip.h with a few status values in order
to cover all cases, so nand.h and onenand.h can use flstate_t
without declaring their own status enum.
Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'include/linux/mtd/flashchip.h')
| -rw-r--r-- | include/linux/mtd/flashchip.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h index d4f38c5fd44e..f350a4879f75 100644 --- a/include/linux/mtd/flashchip.h +++ b/include/linux/mtd/flashchip.h @@ -38,6 +38,13 @@ typedef enum { FL_XIP_WHILE_ERASING, FL_XIP_WHILE_WRITING, FL_SHUTDOWN, + /* These 2 come from nand_state_t, which has been unified here */ + FL_READING, + FL_CACHEDPRG, + /* These 2 come from onenand_state_t, which has been unified here */ + FL_RESETING, + FL_OTPING, + FL_UNKNOWN } flstate_t; |