1 files changed, 12 insertions, 4 deletions

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index ac8e89d5a792..9e6c8f9f306e 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -198,6 +198,7 @@ typedef enum {
 /* Cell info constants */
 #define NAND_CI_CHIPNR_MSK      0x03
 #define NAND_CI_CELLTYPE_MSK    0x0C
+#define NAND_CI_CELLTYPE_SHIFT  2
 
 /* Keep gcc happy */
 struct nand_chip;
@@ -477,7 +478,7 @@ struct nand_buffers {
  * @badblockbits:       [INTERN] minimum number of set bits in a good block's
  *                      bad block marker position; i.e., BBM == 11110111b is
  *                      not bad when badblockbits == 7
- * @cellinfo:           [INTERN] MLC/multichip data from chip ident
+ * @bits_per_cell:      [INTERN] number of bits per cell. i.e., 1 means SLC.
  * @ecc_strength_ds:    [INTERN] ECC correctability from the datasheet.
  *                      Minimum amount of bit errors per @ecc_step_ds guaranteed
  *                      to be correctable. If unknown, set to zero.
@@ -498,7 +499,6 @@ struct nand_buffers {
  *                      supported, 0 otherwise.
  * @onfi_set_features:  [REPLACEABLE] set the features for ONFI nand
  * @onfi_get_features:  [REPLACEABLE] get the features for ONFI nand
- * @ecclayout:          [REPLACEABLE] the default ECC placement scheme
  * @bbt:                [INTERN] bad block table pointer
  * @bbt_td:             [REPLACEABLE] bad block table descriptor for flash
  *                      lookup.
@@ -559,7 +559,7 @@ struct nand_chip {
         int pagebuf;
         unsigned int pagebuf_bitflips;
         int subpagesize;
-        uint8_t cellinfo;
+        uint8_t bits_per_cell;
         uint16_t ecc_strength_ds;
         uint16_t ecc_step_ds;
         int badblockpos;
@@ -572,7 +572,6 @@ struct nand_chip {
 
         uint8_t *oob_poi;
         struct nand_hw_control *controller;
-        struct nand_ecclayout *ecclayout;
 
         struct nand_ecc_ctrl ecc;
         struct nand_buffers *buffers;
@@ -797,4 +796,13 @@ static inline int onfi_get_sync_timing_mode(struct nand_chip *chip)
         return le16_to_cpu(chip->onfi_params.src_sync_timing_mode);
 }
 
+/*
+ * Check if it is a SLC nand.
+ * The !nand_is_slc() can be used to check the MLC/TLC nand chips.
+ * We do not distinguish the MLC and TLC now.
+ */
+static inline bool nand_is_slc(struct nand_chip *chip)
+{
+        return chip->bits_per_cell == 1;
+}
 #endif /* __LINUX_MTD_NAND_H */