diff options
| author | Tom Rini <trini@konsulko.com> | 2023-12-18 08:31:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-12-18 09:55:32 -0500 |
| commit | 1373ffde52e16af83fb14a1d228508a8caaa9996 (patch) | |
| tree | 03bb09d38a260233e3f5b9493d14c82dbd267299 /drivers/mtd/spi/spi-nor-ids.c | |
| parent | fdefb4e194c65777fa11479119adaa71651f41d4 (diff) | |
| parent | 97a897444235921ce19b4f8a3b27de6f5a9ab367 (diff) | |
Merge tag 'v2024.01-rc5' into next
Prepare v2024.01-rc5
Diffstat (limited to 'drivers/mtd/spi/spi-nor-ids.c')
| -rw-r--r-- | drivers/mtd/spi/spi-nor-ids.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index 3cb132dcffc..f86e7ff8e58 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -572,5 +572,10 @@ const struct flash_info spi_nor_ids[] = { { INFO("xt25w01g", 0x0b651B, 0, 64 * 1024, 2048, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, #endif +#ifdef CONFIG_SPI_FLASH_ZBIT + /* Zbit Semiconductor Inc. */ + { INFO("zb25vq128", 0x5e4018, 0, 64 * 1024, 256, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, +#endif { }, }; |