diff --git a/drivers/mtd/nand/spi/Makefile b/drivers/mtd/nand/spi/Makefile index df5a437864f8..af683e89b634 100644 --- a/drivers/mtd/nand/spi/Makefile +++ b/drivers/mtd/nand/spi/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 -spinand-objs := biwin.o core.o dosilicon.o esmt.o etron.o fmsh.o foresee.o gigadevice.o hyf.o jsc.o macronix.o micron.o paragon.o toshiba.o winbond.o +spinand-objs := biwin.o core.o dosilicon.o esmt.o etron.o fmsh.o foresee.o gigadevice.o hyf.o jsc.o macronix.o micron.o paragon.o silicongo.o toshiba.o winbond.o obj-$(CONFIG_MTD_SPI_NAND) += spinand.o diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index cff87545295f..66195038957c 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -861,6 +861,7 @@ static const struct spinand_manufacturer *spinand_manufacturers[] = { ¯onix_spinand_manufacturer, µn_spinand_manufacturer, ¶gon_spinand_manufacturer, + &silicongo_spinand_manufacturer, &toshiba_spinand_manufacturer, &winbond_spinand_manufacturer, }; diff --git a/drivers/mtd/nand/spi/silicongo.c b/drivers/mtd/nand/spi/silicongo.c new file mode 100644 index 000000000000..ddf1bc641a1a --- /dev/null +++ b/drivers/mtd/nand/spi/silicongo.c @@ -0,0 +1,75 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2021 Rockchip Electronics Co., Ltd + * + * Authors: + * Dingqiang Lin + */ + +#include +#include +#include + +#define SPINAND_MFR_SILICONGO 0xEA + +static SPINAND_OP_VARIANTS(read_cache_variants, + SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0), + SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), + SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), + SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), + SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0), + SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0)); + +static SPINAND_OP_VARIANTS(write_cache_variants, + SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), + SPINAND_PROG_LOAD(true, 0, NULL, 0)); + +static SPINAND_OP_VARIANTS(update_cache_variants, + SPINAND_PROG_LOAD_X4(false, 0, NULL, 0), + SPINAND_PROG_LOAD(false, 0, NULL, 0)); + +static int sgm7000i_ooblayout_ecc(struct mtd_info *mtd, int section, + struct mtd_oob_region *region) +{ + return -ERANGE; +} + +static int sgm7000i_ooblayout_free(struct mtd_info *mtd, int section, + struct mtd_oob_region *region) +{ + if (section) + return -ERANGE; + + region->offset = 2; + region->length = mtd->oobsize - 2; + + return 0; +} + +static const struct mtd_ooblayout_ops sgm7000i_ooblayout = { + .ecc = sgm7000i_ooblayout_ecc, + .free = sgm7000i_ooblayout_free, +}; + +static const struct spinand_info silicongo_spinand_table[] = { + SPINAND_INFO("SGM7000I-S24W1GH", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xC1), + NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), + NAND_ECCREQ(4, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&sgm7000i_ooblayout, NULL)), +}; + +static const struct spinand_manufacturer_ops silicongo_spinand_manuf_ops = { +}; + +const struct spinand_manufacturer silicongo_spinand_manufacturer = { + .id = SPINAND_MFR_SILICONGO, + .name = "silicongo", + .chips = silicongo_spinand_table, + .nchips = ARRAY_SIZE(silicongo_spinand_table), + .ops = &silicongo_spinand_manuf_ops, +}; diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index ba55edd5e96f..f1c3856d0d46 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -251,6 +251,7 @@ extern const struct spinand_manufacturer macronix_spinand_manufacturer; extern const struct spinand_manufacturer micron_spinand_manufacturer; extern const struct spinand_manufacturer paragon_spinand_manufacturer; extern const struct spinand_manufacturer toshiba_spinand_manufacturer; +extern const struct spinand_manufacturer silicongo_spinand_manufacturer; extern const struct spinand_manufacturer winbond_spinand_manufacturer; /**