diff options
author | andy.hu <andy.hu@starfivetech.com> | 2024-01-19 13:43:46 +0300 |
---|---|---|
committer | andy.hu <andy.hu@starfivetech.com> | 2024-01-19 13:43:46 +0300 |
commit | b63ace40fd5bd1087bc146cd910d65e57ff30db4 (patch) | |
tree | a748a29bf80d8e8d47b15b3a95d7a01cf3d7d83b | |
parent | 9979b156e85bef0fc96dc197ba4c46d78eaf3549 (diff) | |
parent | 836d9c3eb6b20dc9cfcf46b1f4fdf1c5bdc1270b (diff) | |
download | linux-b63ace40fd5bd1087bc146cd910d65e57ff30db4.tar.xz |
Merge branch 'CR_9038_qspi_32Mflash_515_ziv.xu' into 'jh7110-5.15.y-devel'
CR_9038_qspi_32Mflash_515_ziv.xu
See merge request sdk/linux!1013
-rw-r--r-- | arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 2 | ||||
-rw-r--r-- | drivers/mtd/spi-nor/gigadevice.c | 47 |
2 files changed, 34 insertions, 15 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi index 6c9cbbe96cc2..67e3a8bf97c5 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi @@ -746,7 +746,7 @@ nor_flash: nor-flash@0 { compatible = "jedec,spi-nor"; reg=<0>; - cdns,read-delay = <5>; + cdns,read-delay = <3>; spi-max-frequency = <100000000>; cdns,tshsl-ns = <1>; cdns,tsd2d-ns = <1>; diff --git a/drivers/mtd/spi-nor/gigadevice.c b/drivers/mtd/spi-nor/gigadevice.c index 70c816ded7fa..36352a90d70b 100644 --- a/drivers/mtd/spi-nor/gigadevice.c +++ b/drivers/mtd/spi-nor/gigadevice.c @@ -8,18 +8,33 @@ #include "core.h" -static void gd25q256_default_init(struct spi_nor *nor) +static void gigadevice_default_init(struct spi_nor *nor) { - /* use Quad page program */ + /* Use Quad Page Program */ nor->params->hwcaps.mask |= SNOR_HWCAPS_PP_1_1_4; spi_nor_set_pp_settings(&nor->params->page_programs[SNOR_CMD_PP_1_1_4], SPINOR_OP_PP_1_1_4, SNOR_PROTO_1_1_4); } +static void gd25q256_default_init(struct spi_nor *nor) +{ + /* + * Some manufacturer like GigaDevice may use different + * bit to set QE on different memories, so the MFR can't + * indicate the quad_enable method for this case, we need + * to set it in the default_init fixup hook. + */ + nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable; +} + static struct spi_nor_fixups gd25q256_fixups = { .default_init = gd25q256_default_init, }; +static struct spi_nor_fixups gigadevice_fixups = { + .default_init = gigadevice_default_init, +}; + static const struct flash_info gigadevice_parts[] = { { "gd25q16", INFO(0xc84015, 0, 64 * 1024, 32, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | @@ -28,24 +43,29 @@ static const struct flash_info gigadevice_parts[] = { SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, { "gd25lq32", INFO(0xc86016, 0, 64 * 1024, 64, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | - SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | + SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, { "gd25q64", INFO(0xc84017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, { "gd25lq64c", INFO(0xc86017, 0, 64 * 1024, 128, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | - SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | + SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, { "gd25lq128d", INFO(0xc86018, 0, 64 * 1024, 256, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_SKIP_SFDP | - SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | + SPI_NOR_SKIP_SFDP | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) + .fixups = &gigadevice_fixups }, { "gd25q128", INFO(0xc84018, 0, 64 * 1024, 256, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | - SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | + SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, + { "gd25lq256d", INFO(0xc86019, 0, 64 * 1024, 512, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | + SPI_NOR_SKIP_SFDP | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) + .fixups = &gigadevice_fixups }, { "gd25q256", INFO(0xc84019, 0, 64 * 1024, 512, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | - SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK | - SPI_NOR_HAS_TB | SPI_NOR_TB_SR_BIT6) + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | + SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK | + SPI_NOR_HAS_TB | SPI_NOR_TB_SR_BIT6) .fixups = &gd25q256_fixups }, }; @@ -53,5 +73,4 @@ const struct spi_nor_manufacturer spi_nor_gigadevice = { .name = "gigadevice", .parts = gigadevice_parts, .nparts = ARRAY_SIZE(gigadevice_parts), - .fixups = &gd25q256_fixups, }; |