1 files changed, 38 insertions, 3 deletions

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 9e6c8f9f306e..32f8612469d8 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -219,6 +219,9 @@ struct nand_chip;
 /* ONFI feature address */
 #define ONFI_FEATURE_ADDR_TIMING_MODE   0x1
 
+/* Vendor-specific feature address (Micron) */
+#define ONFI_FEATURE_ADDR_READ_RETRY    0x89
+
 /* ONFI subfeature parameters length */
 #define ONFI_SUBFEATURE_PARAM_LEN       4
 
@@ -279,16 +282,17 @@ struct nand_onfi_params {
         __le16 io_pin_capacitance_typ;
         __le16 input_pin_capacitance_typ;
         u8 input_pin_capacitance_max;
-        u8 driver_strenght_support;
+        u8 driver_strength_support;
         __le16 t_int_r;
         __le16 t_ald;
         u8 reserved4[7];
 
         /* vendor */
-        u8 reserved5[90];
+        __le16 vendor_revision;
+        u8 vendor[88];
 
         __le16 crc;
-} __attribute__((packed));
+} __packed;
 
 #define ONFI_CRC_BASE   0x4F4E
 
@@ -326,6 +330,26 @@ struct onfi_ext_param_page {
          */
 } __packed;
 
+struct nand_onfi_vendor_micron {
+        u8 two_plane_read;
+        u8 read_cache;
+        u8 read_unique_id;
+        u8 dq_imped;
+        u8 dq_imped_num_settings;
+        u8 dq_imped_feat_addr;
+        u8 rb_pulldown_strength;
+        u8 rb_pulldown_strength_feat_addr;
+        u8 rb_pulldown_strength_num_settings;
+        u8 otp_mode;
+        u8 otp_page_start;
+        u8 otp_data_prot_addr;
+        u8 otp_num_pages;
+        u8 otp_feat_addr;
+        u8 read_retry_options;
+        u8 reserved[72];
+        u8 param_revision;
+} __packed;
+
 /**
  * struct nand_hw_control - Control structure for hardware controller (e.g ECC generator) shared among independent devices
  * @lock:               protection lock
@@ -432,6 +456,8 @@ struct nand_buffers {
  *                      flash device.
  * @read_byte:          [REPLACEABLE] read one byte from the chip
  * @read_word:          [REPLACEABLE] read one word from the chip
+ * @write_byte:         [REPLACEABLE] write a single byte to the chip on the
+ *                      low 8 I/O lines
  * @write_buf:          [REPLACEABLE] write data from the buffer to the chip
  * @read_buf:           [REPLACEABLE] read data from the chip into the buffer
  * @select_chip:        [REPLACEABLE] select chip nr
@@ -451,6 +477,8 @@ struct nand_buffers {
  *                      commands to the chip.
  * @waitfunc:           [REPLACEABLE] hardwarespecific function for wait on
  *                      ready.
+ * @setup_read_retry:   [FLASHSPECIFIC] flash (vendor) specific function for
+ *                      setting the read-retry mode. Mostly needed for MLC NAND.
  * @ecc:                [BOARDSPECIFIC] ECC control structure
  * @buffers:            buffer structure for read/write
  * @hwcontrol:          platform-specific hardware control structure
@@ -497,6 +525,7 @@ struct nand_buffers {
  *                      non 0 if ONFI supported.
  * @onfi_params:        [INTERN] holds the ONFI page parameter when ONFI 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
  * @bbt:                [INTERN] bad block table pointer
@@ -521,6 +550,7 @@ struct nand_chip {
 
         uint8_t (*read_byte)(struct mtd_info *mtd);
         u16 (*read_word)(struct mtd_info *mtd);
+        void (*write_byte)(struct mtd_info *mtd, uint8_t byte);
         void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
         void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len);
         void (*select_chip)(struct mtd_info *mtd, int chip);
@@ -544,6 +574,7 @@ struct nand_chip {
                         int feature_addr, uint8_t *subfeature_para);
         int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip,
                         int feature_addr, uint8_t *subfeature_para);
+        int (*setup_read_retry)(struct mtd_info *mtd, int retry_mode);
 
         int chip_delay;
         unsigned int options;
@@ -568,6 +599,8 @@ struct nand_chip {
         int onfi_version;
         struct nand_onfi_params onfi_params;
 
+        int read_retries;
+
         flstate_t state;
 
         uint8_t *oob_poi;
@@ -600,6 +633,8 @@ struct nand_chip {
 #define NAND_MFR_AMD            0x01
 #define NAND_MFR_MACRONIX       0xc2
 #define NAND_MFR_EON            0x92
+#define NAND_MFR_SANDISK        0x45
+#define NAND_MFR_INTEL          0x89
 
 /* The maximum expected count of bytes in the NAND ID sequence */
 #define NAND_MAX_ID_LEN 8