diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-18 08:27:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-18 08:27:41 -0700 |
| commit | 35f8c769aa5f3d9a81d50e9bdcbfd4151e72a0c9 (patch) | |
| tree | 5541f88e5da4df063e53bcf841217d7c79d9aec4 /include/linux | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff) | |
| parent | mtd: nand: reintroduce NAND_NO_READRDY as NAND_NEED_READRDY (diff) | |
| download | linux-dev-35f8c769aa5f3d9a81d50e9bdcbfd4151e72a0c9.tar.xz linux-dev-35f8c769aa5f3d9a81d50e9bdcbfd4151e72a0c9.zip | |
Merge tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd
Pull MTD fixes from David Woodhouse:
"This fixes a couple of problems. Firstly, some people are actually
still using old small-page flash and we broke it by removing the ready
check.
Secondly. fix the handling of partitions on Broadcom 47xx devices.
Recent changes had made it misdetect the location of the NVRAM and
scribble over the bootloader when it tried to update the variables
there. With predictably sad results."
* tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd:
mtd: nand: reintroduce NAND_NO_READRDY as NAND_NEED_READRDY
mtd: bcm47xxpart: look for NVRAM at the end of device
Revert "mtd: bcm47xxpart: improve probing of nvram partition"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/nand.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 7ccb3c59ed60..ef52d9c91459 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -187,6 +187,13 @@ typedef enum { * This happens with the Renesas AG-AND chips, possibly others. */ #define BBT_AUTO_REFRESH 0x00000080 +/* + * Chip requires ready check on read (for auto-incremented sequential read). + * True only for small page devices; large page devices do not support + * autoincrement. + */ +#define NAND_NEED_READRDY 0x00000100 + /* Chip does not allow subpage writes */ #define NAND_NO_SUBPAGE_WRITE 0x00000200 |