Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx> wrote on Wed, 27 May 2020 00:02:03 +0200: > On Tue, 26 May 2020 21:17:21 +0200 > Miquel Raynal <miquel.raynal@xxxxxxxxxxx> wrote: > > > This chip supports ONFI SDR timing mode 2, implement the new hook to > > advertize it. > > > > Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx> > > --- > > drivers/mtd/nand/raw/nand_ids.c | 3 +-- > > drivers/mtd/nand/raw/nand_toshiba.c | 21 +++++++++++++++++++++ > > 2 files changed, 22 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c > > index e0dbc2e316c7..c729a8bc895d 100644 > > --- a/drivers/mtd/nand/raw/nand_ids.c > > +++ b/drivers/mtd/nand/raw/nand_ids.c > > @@ -28,8 +28,7 @@ struct nand_flash_dev nand_flash_ids[] = { > > */ > > {"TC58NVG0S3E 1G 3.3V 8-bit", > > { .id = {0x98, 0xd1, 0x90, 0x15, 0x76, 0x14, 0x01, 0x00} }, > > - SZ_2K, SZ_128, SZ_128K, 0, 8, 64, NAND_ECC_INFO(1, SZ_512), > > - 2 }, > > + SZ_2K, SZ_128, SZ_128K, 0, 8, 64, NAND_ECC_INFO(1, SZ_512), }, > > {"TC58NVG2S0F 4G 3.3V 8-bit", > > { .id = {0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08} }, > > SZ_4K, SZ_512, SZ_256K, 0, 8, 224, NAND_ECC_INFO(4, SZ_512) }, > > diff --git a/drivers/mtd/nand/raw/nand_toshiba.c b/drivers/mtd/nand/raw/nand_toshiba.c > > index fe2bc20972a9..860ae0c13063 100644 > > --- a/drivers/mtd/nand/raw/nand_toshiba.c > > +++ b/drivers/mtd/nand/raw/nand_toshiba.c > > @@ -206,6 +206,18 @@ tc58teg5dclta00_choose_data_interface(struct nand_chip *chip, > > return nand_choose_best_sdr_timings(chip, iface, NULL); > > } > > > > +static int tc58nvg0s3e_choose_data_interface(struct nand_chip *chip, > > + struct nand_data_interface *iface) > > +{ > > + int ret; > > + > > + ret = onfi_fill_data_interface(chip, iface, NAND_SDR_IFACE, 2); > > + if (ret) > > + return ret; > > + > > + return nand_choose_best_sdr_timings(chip, iface, NULL); > > +} > > + > > static int tc58teg5dclta00_init(struct nand_chip *chip) > > { > > struct mtd_info *mtd = nand_to_mtd(chip); > > @@ -217,6 +229,13 @@ static int tc58teg5dclta00_init(struct nand_chip *chip) > > return 0; > > } > > > > +static int tc58nvg0s3e_init(struct nand_chip *chip) > > +{ > > + chip->ops.choose_data_interface = &tc58nvg0s3e_choose_data_interface; > > + > > + return 0; > > +} > > + > > static int toshiba_nand_init(struct nand_chip *chip) > > { > > if (nand_is_slc(chip)) > > @@ -229,6 +248,8 @@ static int toshiba_nand_init(struct nand_chip *chip) > > > > if (!strcmp("TC58TEG5DCLTA00", chip->parameters.model)) > > tc58teg5dclta00_init(chip); > > + if (!strcmp("TC58NVG0S3E", chip->parameters.model)) > > The model won't match "TC58NVG0S3E", unless you use strncmp(). I definitely will. > > > + tc58nvg0s3e_init(chip); > > > > return 0; > > } > ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/