Skip to content

Commit f9d52ef

Browse files
mwalleambarus
mwalle
authored and
ambarus
committed
mtd: spi-nor: atmel: 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-17-e60548861b10@kernel.org Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
1 parent da7e48d commit f9d52ef

1 file changed

Lines changed: 80 additions & 42 deletions

File tree

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

Lines changed: 80 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -163,48 +163,86 @@ static const struct spi_nor_fixups atmel_nor_global_protection_fixups = {
163163
};
164164

165165
static const struct flash_info atmel_nor_parts[] = {
166-
{ "at25fs010", INFO(0x1f6601, 0, 32 * 1024, 4)
167-
FLAGS(SPI_NOR_HAS_LOCK)
168-
NO_SFDP_FLAGS(SECT_4K)
169-
.fixups = &at25fs_nor_fixups },
170-
{ "at25fs040", INFO(0x1f6604, 0, 64 * 1024, 8)
171-
FLAGS(SPI_NOR_HAS_LOCK)
172-
NO_SFDP_FLAGS(SECT_4K)
173-
.fixups = &at25fs_nor_fixups },
174-
{ "at25df041a", INFO(0x1f4401, 0, 64 * 1024, 8)
175-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
176-
NO_SFDP_FLAGS(SECT_4K)
177-
.fixups = &atmel_nor_global_protection_fixups },
178-
{ "at25df321", INFO(0x1f4700, 0, 64 * 1024, 64)
179-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
180-
NO_SFDP_FLAGS(SECT_4K)
181-
.fixups = &atmel_nor_global_protection_fixups },
182-
{ "at25df321a", INFO(0x1f4701, 0, 64 * 1024, 64)
183-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
184-
NO_SFDP_FLAGS(SECT_4K)
185-
.fixups = &atmel_nor_global_protection_fixups },
186-
{ "at25df641", INFO(0x1f4800, 0, 64 * 1024, 128)
187-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
188-
NO_SFDP_FLAGS(SECT_4K)
189-
.fixups = &atmel_nor_global_protection_fixups },
190-
{ "at25sl321", INFO(0x1f4216, 0, 64 * 1024, 64)
191-
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
192-
{ "at26f004", INFO(0x1f0400, 0, 64 * 1024, 8)
193-
NO_SFDP_FLAGS(SECT_4K) },
194-
{ "at26df081a", INFO(0x1f4501, 0, 64 * 1024, 16)
195-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
196-
NO_SFDP_FLAGS(SECT_4K)
197-
.fixups = &atmel_nor_global_protection_fixups },
198-
{ "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32)
199-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
200-
NO_SFDP_FLAGS(SECT_4K)
201-
.fixups = &atmel_nor_global_protection_fixups },
202-
{ "at26df321", INFO(0x1f4700, 0, 64 * 1024, 64)
203-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
204-
NO_SFDP_FLAGS(SECT_4K)
205-
.fixups = &atmel_nor_global_protection_fixups },
206-
{ "at45db081d", INFO(0x1f2500, 0, 64 * 1024, 16)
207-
NO_SFDP_FLAGS(SECT_4K) },
166+
{
167+
.id = SNOR_ID(0x1f, 0x66, 0x01),
168+
.name = "at25fs010",
169+
.sector_size = SZ_32K,
170+
.size = SZ_128K,
171+
.flags = SPI_NOR_HAS_LOCK,
172+
.no_sfdp_flags = SECT_4K,
173+
.fixups = &at25fs_nor_fixups
174+
}, {
175+
.id = SNOR_ID(0x1f, 0x66, 0x04),
176+
.name = "at25fs040",
177+
.size = SZ_512K,
178+
.flags = SPI_NOR_HAS_LOCK,
179+
.no_sfdp_flags = SECT_4K,
180+
.fixups = &at25fs_nor_fixups
181+
}, {
182+
.id = SNOR_ID(0x1f, 0x44, 0x01),
183+
.name = "at25df041a",
184+
.size = SZ_512K,
185+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
186+
.no_sfdp_flags = SECT_4K,
187+
.fixups = &atmel_nor_global_protection_fixups,
188+
}, {
189+
.id = SNOR_ID(0x1f, 0x47, 0x00),
190+
.name = "at25df321",
191+
.size = SZ_4M,
192+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
193+
.no_sfdp_flags = SECT_4K,
194+
.fixups = &atmel_nor_global_protection_fixups
195+
}, {
196+
.id = SNOR_ID(0x1f, 0x47, 0x01),
197+
.name = "at25df321a",
198+
.size = SZ_4M,
199+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
200+
.no_sfdp_flags = SECT_4K,
201+
.fixups = &atmel_nor_global_protection_fixups
202+
}, {
203+
.id = SNOR_ID(0x1f, 0x48, 0x00),
204+
.name = "at25df641",
205+
.size = SZ_8M,
206+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
207+
.no_sfdp_flags = SECT_4K,
208+
.fixups = &atmel_nor_global_protection_fixups
209+
}, {
210+
.id = SNOR_ID(0x1f, 0x42, 0x16),
211+
.name = "at25sl321",
212+
.size = SZ_4M,
213+
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
214+
}, {
215+
.id = SNOR_ID(0x1f, 0x04, 0x00),
216+
.name = "at26f004",
217+
.size = SZ_512K,
218+
.no_sfdp_flags = SECT_4K,
219+
}, {
220+
.id = SNOR_ID(0x1f, 0x45, 0x01),
221+
.name = "at26df081a",
222+
.size = SZ_1M,
223+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
224+
.no_sfdp_flags = SECT_4K,
225+
.fixups = &atmel_nor_global_protection_fixups
226+
}, {
227+
.id = SNOR_ID(0x1f, 0x46, 0x01),
228+
.name = "at26df161a",
229+
.size = SZ_2M,
230+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
231+
.no_sfdp_flags = SECT_4K,
232+
.fixups = &atmel_nor_global_protection_fixups
233+
}, {
234+
.id = SNOR_ID(0x1f, 0x47, 0x00),
235+
.name = "at26df321",
236+
.size = SZ_4M,
237+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
238+
.no_sfdp_flags = SECT_4K,
239+
.fixups = &atmel_nor_global_protection_fixups
240+
}, {
241+
.id = SNOR_ID(0x1f, 0x25, 0x00),
242+
.name = "at45db081d",
243+
.size = SZ_1M,
244+
.no_sfdp_flags = SECT_4K,
245+
},
208246
};
209247

210248
const struct spi_nor_manufacturer spi_nor_atmel = {

0 commit comments

Comments
 (0)