aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/mtd/nand.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index d5903c0a0fe7..0f78d19303c5 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -546,6 +546,9 @@ struct nand_chip {
546#define NAND_MFR_MACRONIX 0xc2 546#define NAND_MFR_MACRONIX 0xc2
547#define NAND_MFR_EON 0x92 547#define NAND_MFR_EON 0x92
548 548
549/* The maximum expected count of bytes in the NAND ID sequence */
550#define NAND_MAX_ID_LEN 8
551
549/* 552/*
550 * A helper for defining older NAND chips where the second ID byte fully 553 * A helper for defining older NAND chips where the second ID byte fully
551 * defined the chip, including the geometry (chip size, eraseblock size, page 554 * defined the chip, including the geometry (chip size, eraseblock size, page
@@ -593,7 +596,7 @@ struct nand_flash_dev {
593 uint8_t mfr_id; 596 uint8_t mfr_id;
594 uint8_t dev_id; 597 uint8_t dev_id;
595 }; 598 };
596 uint8_t id[8]; 599 uint8_t id[NAND_MAX_ID_LEN];
597 }; 600 };
598 unsigned int pagesize; 601 unsigned int pagesize;
599 unsigned int chipsize; 602 unsigned int chipsize;