diff options
| author | Tom Rini <trini@ti.com> | 2012-09-18 07:55:07 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-18 07:55:07 -0700 |
| commit | c413a004ea62d0ff150c85615348c59ea456bb34 (patch) | |
| tree | 8caa6ccf4f53821b723a75a82436daa9464769b0 /include/linux/mtd/nand.h | |
| parent | 037e9d33db9fc86c1e671d64077b2d1a19df7f24 (diff) | |
| parent | 9c60e75e05dab5a0197728b6a940aaac02762936 (diff) | |
| download | u-boot-imx-c413a004ea62d0ff150c85615348c59ea456bb34.zip u-boot-imx-c413a004ea62d0ff150c85615348c59ea456bb34.tar.gz u-boot-imx-c413a004ea62d0ff150c85615348c59ea456bb34.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'include/linux/mtd/nand.h')
| -rw-r--r-- | include/linux/mtd/nand.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 82704de..c06866b 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -85,8 +85,10 @@ extern void nand_wait_ready(struct mtd_info *mtd); #define NAND_CMD_RESET 0xff #define NAND_CMD_LOCK 0x2a +#define NAND_CMD_LOCK_TIGHT 0x2c #define NAND_CMD_UNLOCK1 0x23 #define NAND_CMD_UNLOCK2 0x24 +#define NAND_CMD_LOCK_STATUS 0x7a /* Extended commands for large page devices */ #define NAND_CMD_READSTART 0x30 @@ -205,9 +207,6 @@ typedef enum { #define NAND_SUBPAGE_READ(chip) ((chip->ecc.mode == NAND_ECC_SOFT) \ && (chip->page_shift > 9)) -/* Mask to zero out the chip options, which come from the id table */ -#define NAND_CHIPOPTIONS_MSK (0x0000ffff & ~NAND_NO_AUTOINCR) - /* Non chip related options */ /* * Use a flash based bad block table. OOB identifier is saved in OOB area. |