Skip to content

L
linux
Commit 47541a60 authored by Michael Walle's avatar Michael Walle Committed by Tudor Ambarus
Browse files
Options

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: default avatarMichael Walle <mwalle@kernel.org>
Link: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v3-27-e60548861b10@kernel.orgSigned-off-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
parent bb2d5c67
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 58 deletions
drivers/mtd/spi-nor/sst.c
View file @ 47541a60
...@@ -61,64 +61,110 @@ static const struct spi_nor_fixups sst26vf_nor_fixups = { ...@@ -61,64 +61,110 @@ static const struct spi_nor_fixups sst26vf_nor_fixups = {
}; };
static const struct flash_info sst_nor_parts[] = { 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) .id = SNOR_ID(0xbf, 0x25, 0x8d),
NO_SFDP_FLAGS(SECT_4K) .name = "sst25vf040b",
MFR_FLAGS(SST_WRITE) }, .size = SZ_512K,
{ "sst25vf080b", INFO(0xbf258e, 0, 64 * 1024, 16) .flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) .no_sfdp_flags = SECT_4K,
NO_SFDP_FLAGS(SECT_4K) .mfr_flags = SST_WRITE,
MFR_FLAGS(SST_WRITE) }, }, {
{ "sst25vf016b", INFO(0xbf2541, 0, 64 * 1024, 32) .id = SNOR_ID(0xbf, 0x25, 0x8e),
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) .name = "sst25vf080b",
NO_SFDP_FLAGS(SECT_4K) .size = SZ_1M,
MFR_FLAGS(SST_WRITE) }, .flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
{ "sst25vf032b", INFO(0xbf254a, 0, 64 * 1024, 64) .no_sfdp_flags = SECT_4K,
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) .mfr_flags = SST_WRITE,
NO_SFDP_FLAGS(SECT_4K) }, {
MFR_FLAGS(SST_WRITE) }, .id = SNOR_ID(0xbf, 0x25, 0x41),
{ "sst25vf064c", INFO(0xbf254b, 0, 64 * 1024, 128) .name = "sst25vf016b",
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_4BIT_BP | .size = SZ_2M,
SPI_NOR_SWP_IS_VOLATILE) .flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
NO_SFDP_FLAGS(SECT_4K) }, .no_sfdp_flags = SECT_4K,
{ "sst25wf512", INFO(0xbf2501, 0, 64 * 1024, 1) .mfr_flags = SST_WRITE,
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) }, {
NO_SFDP_FLAGS(SECT_4K) .id = SNOR_ID(0xbf, 0x25, 0x4a),
MFR_FLAGS(SST_WRITE) }, .name = "sst25vf032b",
{ "sst25wf010", INFO(0xbf2502, 0, 64 * 1024, 2) .size = SZ_4M,
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) .flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
NO_SFDP_FLAGS(SECT_4K) .no_sfdp_flags = SECT_4K,
MFR_FLAGS(SST_WRITE) }, .mfr_flags = SST_WRITE,
{ "sst25wf020", INFO(0xbf2503, 0, 64 * 1024, 4) }, {
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) .id = SNOR_ID(0xbf, 0x25, 0x4b),
NO_SFDP_FLAGS(SECT_4K) .name = "sst25vf064c",
MFR_FLAGS(SST_WRITE) }, .size = SZ_8M,
{ "sst25wf020a", INFO(0x621612, 0, 64 * 1024, 4) .flags = SPI_NOR_HAS_LOCK | SPI_NOR_4BIT_BP | SPI_NOR_SWP_IS_VOLATILE,
FLAGS(SPI_NOR_HAS_LOCK) .no_sfdp_flags = SECT_4K,
NO_SFDP_FLAGS(SECT_4K) }, }, {
{ "sst25wf040b", INFO(0x621613, 0, 64 * 1024, 8) .id = SNOR_ID(0xbf, 0x25, 0x01),
FLAGS(SPI_NOR_HAS_LOCK) .name = "sst25wf512",
NO_SFDP_FLAGS(SECT_4K) }, .size = SZ_64K,
{ "sst25wf040", INFO(0xbf2504, 0, 64 * 1024, 8) .flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) .no_sfdp_flags = SECT_4K,
NO_SFDP_FLAGS(SECT_4K) .mfr_flags = SST_WRITE,
MFR_FLAGS(SST_WRITE) }, }, {
{ "sst25wf080", INFO(0xbf2505, 0, 64 * 1024, 16) .id = SNOR_ID(0xbf, 0x25, 0x02),
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) .name = "sst25wf010",
NO_SFDP_FLAGS(SECT_4K) .size = SZ_128K,
MFR_FLAGS(SST_WRITE) }, .flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
{ "sst26wf016b", INFO(0xbf2651, 0, 64 * 1024, 32) .no_sfdp_flags = SECT_4K,
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | .mfr_flags = SST_WRITE,
SPI_NOR_QUAD_READ) }, }, {
{ "sst26vf016b", INFO(0xbf2641, 0, 64 * 1024, 32) .id = SNOR_ID(0xbf, 0x25, 0x03),
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) }, .name = "sst25wf020",
{ "sst26vf032b", INFO(0xbf2642, 0, 0, 0) .size = SZ_256K,
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) .flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
.fixups = &sst26vf_nor_fixups }, .no_sfdp_flags = SECT_4K,
{ "sst26vf064b", INFO(0xbf2643, 0, 64 * 1024, 128) .mfr_flags = SST_WRITE,
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) }, {
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) .id = SNOR_ID(0x62, 0x16, 0x12),
.fixups = &sst26vf_nor_fixups }, .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, static int sst_nor_write(struct mtd_info *mtd, loff_t to, size_t len,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7