mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 22:21:42 +00:00
mtd: spi-nor: sst: convert flash_info to new format
The INFOx() macros are going away. Convert the flash_info database to the new format. Signed-off-by: Michael Walle <mwalle@kernel.org> Link: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v3-27-e60548861b10@kernel.org Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
This commit is contained in:
Michael Walle
Tudor Ambarus
parent
bb2d5c67b9
commit
47541a6063
@ -61,64 +61,110 @@ static const struct spi_nor_fixups sst26vf_nor_fixups = {
|
||||
};
|
||||
|
||||
static const struct flash_info sst_nor_parts[] = {
|
||||
{ "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024, 8)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K)
|
||||
MFR_FLAGS(SST_WRITE) },
|
||||
{ "sst25vf080b", INFO(0xbf258e, 0, 64 * 1024, 16)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K)
|
||||
MFR_FLAGS(SST_WRITE) },
|
||||
{ "sst25vf016b", INFO(0xbf2541, 0, 64 * 1024, 32)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K)
|
||||
MFR_FLAGS(SST_WRITE) },
|
||||
{ "sst25vf032b", INFO(0xbf254a, 0, 64 * 1024, 64)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K)
|
||||
MFR_FLAGS(SST_WRITE) },
|
||||
{ "sst25vf064c", INFO(0xbf254b, 0, 64 * 1024, 128)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_4BIT_BP |
|
||||
SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K) },
|
||||
{ "sst25wf512", INFO(0xbf2501, 0, 64 * 1024, 1)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K)
|
||||
MFR_FLAGS(SST_WRITE) },
|
||||
{ "sst25wf010", INFO(0xbf2502, 0, 64 * 1024, 2)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K)
|
||||
MFR_FLAGS(SST_WRITE) },
|
||||
{ "sst25wf020", INFO(0xbf2503, 0, 64 * 1024, 4)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K)
|
||||
MFR_FLAGS(SST_WRITE) },
|
||||
{ "sst25wf020a", INFO(0x621612, 0, 64 * 1024, 4)
|
||||
FLAGS(SPI_NOR_HAS_LOCK)
|
||||
NO_SFDP_FLAGS(SECT_4K) },
|
||||
{ "sst25wf040b", INFO(0x621613, 0, 64 * 1024, 8)
|
||||
FLAGS(SPI_NOR_HAS_LOCK)
|
||||
NO_SFDP_FLAGS(SECT_4K) },
|
||||
{ "sst25wf040", INFO(0xbf2504, 0, 64 * 1024, 8)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K)
|
||||
MFR_FLAGS(SST_WRITE) },
|
||||
{ "sst25wf080", INFO(0xbf2505, 0, 64 * 1024, 16)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K)
|
||||
MFR_FLAGS(SST_WRITE) },
|
||||
{ "sst26wf016b", INFO(0xbf2651, 0, 64 * 1024, 32)
|
||||
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ |
|
||||
SPI_NOR_QUAD_READ) },
|
||||
{ "sst26vf016b", INFO(0xbf2641, 0, 64 * 1024, 32)
|
||||
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) },
|
||||
{ "sst26vf032b", INFO(0xbf2642, 0, 0, 0)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
.fixups = &sst26vf_nor_fixups },
|
||||
{ "sst26vf064b", INFO(0xbf2643, 0, 64 * 1024, 128)
|
||||
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
|
||||
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
|
||||
.fixups = &sst26vf_nor_fixups },
|
||||
{
|
||||
.id = SNOR_ID(0xbf, 0x25, 0x8d),
|
||||
.name = "sst25vf040b",
|
||||
.size = SZ_512K,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
.mfr_flags = SST_WRITE,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x25, 0x8e),
|
||||
.name = "sst25vf080b",
|
||||
.size = SZ_1M,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
.mfr_flags = SST_WRITE,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x25, 0x41),
|
||||
.name = "sst25vf016b",
|
||||
.size = SZ_2M,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
.mfr_flags = SST_WRITE,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x25, 0x4a),
|
||||
.name = "sst25vf032b",
|
||||
.size = SZ_4M,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
.mfr_flags = SST_WRITE,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x25, 0x4b),
|
||||
.name = "sst25vf064c",
|
||||
.size = SZ_8M,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_4BIT_BP | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x25, 0x01),
|
||||
.name = "sst25wf512",
|
||||
.size = SZ_64K,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
.mfr_flags = SST_WRITE,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x25, 0x02),
|
||||
.name = "sst25wf010",
|
||||
.size = SZ_128K,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
.mfr_flags = SST_WRITE,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x25, 0x03),
|
||||
.name = "sst25wf020",
|
||||
.size = SZ_256K,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
.mfr_flags = SST_WRITE,
|
||||
}, {
|
||||
.id = SNOR_ID(0x62, 0x16, 0x12),
|
||||
.name = "sst25wf020a",
|
||||
.size = SZ_256K,
|
||||
.flags = SPI_NOR_HAS_LOCK,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
}, {
|
||||
.id = SNOR_ID(0x62, 0x16, 0x13),
|
||||
.name = "sst25wf040b",
|
||||
.size = SZ_512K,
|
||||
.flags = SPI_NOR_HAS_LOCK,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x25, 0x04),
|
||||
.name = "sst25wf040",
|
||||
.size = SZ_512K,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
.mfr_flags = SST_WRITE,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x25, 0x05),
|
||||
.name = "sst25wf080",
|
||||
.size = SZ_1M,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K,
|
||||
.mfr_flags = SST_WRITE,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x26, 0x51),
|
||||
.name = "sst26wf016b",
|
||||
.size = SZ_2M,
|
||||
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x26, 0x41),
|
||||
.name = "sst26vf016b",
|
||||
.size = SZ_2M,
|
||||
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x26, 0x42),
|
||||
.name = "sst26vf032b",
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.fixups = &sst26vf_nor_fixups,
|
||||
}, {
|
||||
.id = SNOR_ID(0xbf, 0x26, 0x43),
|
||||
.name = "sst26vf064b",
|
||||
.size = SZ_8M,
|
||||
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
|
||||
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
|
||||
.fixups = &sst26vf_nor_fixups,
|
||||
}
|
||||
};
|
||||
|
||||
static int sst_nor_write(struct mtd_info *mtd, loff_t to, size_t len,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user