Skip to content

Commit 856f617

Browse files
mwalleambarus
mwalle
authored and
ambarus
committed
mtd: spi-nor: issi: 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-23-e60548861b10@kernel.org Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
1 parent 3de6404 commit 856f617

1 file changed

Lines changed: 78 additions & 36 deletions

File tree

‎drivers/mtd/spi-nor/issi.c‎

Lines changed: 78 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -47,44 +47,86 @@ static const struct spi_nor_fixups pm25lv_nor_fixups = {
4747
};
4848

4949
static const struct flash_info issi_nor_parts[] = {
50-
{ "is25cd512", INFO(0x7f9d20, 0, 32 * 1024, 2)
51-
NO_SFDP_FLAGS(SECT_4K) },
52-
{ "is25lq040b", INFO(0x9d4013, 0, 64 * 1024, 8)
53-
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
54-
{ "is25lp016d", INFO(0x9d6015, 0, 64 * 1024, 32)
55-
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
56-
{ "is25lp080d", INFO(0x9d6014, 0, 64 * 1024, 16)
57-
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
58-
{ "is25lp032", INFO(0x9d6016, 0, 64 * 1024, 64)
59-
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) },
60-
{ "is25lp064", INFO(0x9d6017, 0, 64 * 1024, 128)
61-
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) },
62-
{ "is25lp128", INFO(0x9d6018, 0, 64 * 1024, 256)
63-
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) },
64-
{ "is25lp256", INFO(0x9d6019, 0, 64 * 1024, 0)
65-
FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
66-
.fixups = &is25lp256_fixups },
67-
{ "is25wp032", INFO(0x9d7016, 0, 64 * 1024, 64)
68-
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
69-
{ "is25wp064", INFO(0x9d7017, 0, 64 * 1024, 128)
70-
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
71-
{ "is25wp128", INFO(0x9d7018, 0, 64 * 1024, 256)
72-
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
73-
{ "is25wp256", INFO(0x9d7019, 0, 0, 0)
74-
FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
75-
FLAGS(SPI_NOR_QUAD_PP)
76-
.fixups = &is25lp256_fixups },
77-
78-
{ "pm25lv512", INFO0(32 * 1024, 2)
79-
NO_SFDP_FLAGS(SECT_4K)
50+
{
51+
.id = SNOR_ID(0x7f, 0x9d, 0x20),
52+
.name = "is25cd512",
53+
.sector_size = SZ_32K,
54+
.size = SZ_64K,
55+
.no_sfdp_flags = SECT_4K,
56+
}, {
57+
.id = SNOR_ID(0x9d, 0x40, 0x13),
58+
.name = "is25lq040b",
59+
.size = SZ_512K,
60+
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
61+
}, {
62+
.id = SNOR_ID(0x9d, 0x60, 0x15),
63+
.name = "is25lp016d",
64+
.size = SZ_2M,
65+
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
66+
}, {
67+
.id = SNOR_ID(0x9d, 0x60, 0x14),
68+
.name = "is25lp080d",
69+
.size = SZ_1M,
70+
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
71+
}, {
72+
.id = SNOR_ID(0x9d, 0x60, 0x16),
73+
.name = "is25lp032",
74+
.size = SZ_4M,
75+
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
76+
}, {
77+
.id = SNOR_ID(0x9d, 0x60, 0x17),
78+
.name = "is25lp064",
79+
.size = SZ_8M,
80+
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
81+
}, {
82+
.id = SNOR_ID(0x9d, 0x60, 0x18),
83+
.name = "is25lp128",
84+
.size = SZ_16M,
85+
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
86+
}, {
87+
.id = SNOR_ID(0x9d, 0x60, 0x19),
88+
.name = "is25lp256",
89+
.fixups = &is25lp256_fixups,
90+
.fixup_flags = SPI_NOR_4B_OPCODES,
91+
}, {
92+
.id = SNOR_ID(0x9d, 0x70, 0x16),
93+
.name = "is25wp032",
94+
.size = SZ_4M,
95+
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
96+
}, {
97+
.id = SNOR_ID(0x9d, 0x70, 0x17),
98+
.size = SZ_8M,
99+
.name = "is25wp064",
100+
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
101+
}, {
102+
.id = SNOR_ID(0x9d, 0x70, 0x18),
103+
.name = "is25wp128",
104+
.size = SZ_16M,
105+
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
106+
}, {
107+
.id = SNOR_ID(0x9d, 0x70, 0x19),
108+
.name = "is25wp256",
109+
.flags = SPI_NOR_QUAD_PP,
110+
.fixups = &is25lp256_fixups,
111+
.fixup_flags = SPI_NOR_4B_OPCODES,
112+
}, {
113+
.name = "pm25lv512",
114+
.sector_size = SZ_32K,
115+
.size = SZ_64K,
116+
.no_sfdp_flags = SECT_4K,
80117
.fixups = &pm25lv_nor_fixups
81-
},
82-
{ "pm25lv010", INFO0(32 * 1024, 4)
83-
NO_SFDP_FLAGS(SECT_4K)
118+
}, {
119+
.name = "pm25lv010",
120+
.sector_size = SZ_32K,
121+
.size = SZ_128K,
122+
.no_sfdp_flags = SECT_4K,
84123
.fixups = &pm25lv_nor_fixups
85-
},
86-
{ "pm25lq032", INFO(0x7f9d46, 0, 64 * 1024, 64)
87-
NO_SFDP_FLAGS(SECT_4K) },
124+
}, {
125+
.id = SNOR_ID(0x7f, 0x9d, 0x46),
126+
.name = "pm25lq032",
127+
.size = SZ_4M,
128+
.no_sfdp_flags = SECT_4K,
129+
}
88130
};
89131

90132
static void issi_nor_default_init(struct spi_nor *nor)

0 commit comments

Comments
 (0)