Add a new field to attach a pairing scheme to a NAND chip definition, and assign it to mtd->pairing when a full-id match is detected.
Signed-off-by: Boris Brezillon <boris.brezil...@free-electrons.com> --- drivers/mtd/nand/nand_base.c | 1 + include/linux/mtd/nand.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index a64e0d5..0666b59 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -3791,6 +3791,7 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, mtd->writesize = type->pagesize; mtd->erasesize = type->erasesize; mtd->oobsize = type->oobsize; + mtd->pairing = type->pairing; chip->bits_per_cell = nand_get_bits_per_cell(id_data[2]); chip->chipsize = (uint64_t)type->chipsize << 20; diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 874b267..685b26e 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -855,6 +855,7 @@ static inline void nand_set_controller_data(struct nand_chip *chip, void *priv) * @onfi_timing_mode_default: the default ONFI timing mode entered after a NAND * reset. Should be deduced from timings described * in the datasheet. + * @pairing: The page pairing scheme used by this NAND, if any. * */ struct nand_flash_dev { @@ -877,6 +878,7 @@ struct nand_flash_dev { uint16_t step_ds; } ecc; int onfi_timing_mode_default; + const struct mtd_pairing_scheme *pairing; }; /** -- 2.7.4