mtd: nand: add fields for JEDEC in nand_chip

Add the jedec_version field, and add an anonymous union which
contains the nand_onfi_params and nand_jedec_params.

Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

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 {
  * @subpagesize:        [INTERN] holds the subpagesize
  * @onfi_version:       [INTERN] holds the chip ONFI version (BCD encoded),
  *                      non 0 if ONFI supported.
+ * @jedec_version:      [INTERN] holds the chip JEDEC version (BCD encoded),
+ *                      non 0 if JEDEC supported.
  * @onfi_params:        [INTERN] holds the ONFI page parameter when ONFI is
  *                      supported, 0 otherwise.
+ * @jedec_params:       [INTERN] holds the JEDEC parameter page when JEDEC is
+ *                      supported, 0 otherwise.
  * @read_retries:       [INTERN] the number of read retry modes supported
  * @onfi_set_features:  [REPLACEABLE] set the features for ONFI nand
  * @onfi_get_features:  [REPLACEABLE] get the features for ONFI nand
@@ -664,7 +668,11 @@ struct nand_chip {
         int badblockbits;
 
         int onfi_version;
-        struct nand_onfi_params onfi_params;
+        int jedec_version;
+        union {
+                struct nand_onfi_params onfi_params;
+                struct nand_jedec_params jedec_params;
+        };
 
         int read_retries;