aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/mtd/nand.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 588f8a4a27af..f9af7564118a 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -590,8 +590,12 @@ struct nand_buffers {
590 * @subpagesize: [INTERN] holds the subpagesize 590 * @subpagesize: [INTERN] holds the subpagesize
591 * @onfi_version: [INTERN] holds the chip ONFI version (BCD encoded), 591 * @onfi_version: [INTERN] holds the chip ONFI version (BCD encoded),
592 * non 0 if ONFI supported. 592 * non 0 if ONFI supported.
593 * @jedec_version: [INTERN] holds the chip JEDEC version (BCD encoded),
594 * non 0 if JEDEC supported.
593 * @onfi_params: [INTERN] holds the ONFI page parameter when ONFI is 595 * @onfi_params: [INTERN] holds the ONFI page parameter when ONFI is
594 * supported, 0 otherwise. 596 * supported, 0 otherwise.
597 * @jedec_params: [INTERN] holds the JEDEC parameter page when JEDEC is
598 * supported, 0 otherwise.
595 * @read_retries: [INTERN] the number of read retry modes supported 599 * @read_retries: [INTERN] the number of read retry modes supported
596 * @onfi_set_features: [REPLACEABLE] set the features for ONFI nand 600 * @onfi_set_features: [REPLACEABLE] set the features for ONFI nand
597 * @onfi_get_features: [REPLACEABLE] get the features for ONFI nand 601 * @onfi_get_features: [REPLACEABLE] get the features for ONFI nand
@@ -664,7 +668,11 @@ struct nand_chip {
664 int badblockbits; 668 int badblockbits;
665 669
666 int onfi_version; 670 int onfi_version;
667 struct nand_onfi_params onfi_params; 671 int jedec_version;
672 union {
673 struct nand_onfi_params onfi_params;
674 struct nand_jedec_params jedec_params;
675 };
668 676
669 int read_retries; 677 int read_retries;
670 678