Skip to content

Commit 3de6404

Browse files
mwalleambarus
authored andcommitted
mtd: spi-nor: intel: 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-22-e60548861b10@kernel.org Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
1 parent 29cd12e commit 3de6404

1 file changed

Lines changed: 16 additions & 6 deletions

File tree

drivers/mtd/spi-nor/intel.c

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,22 @@
99
#include "core.h"
1010

1111
static const struct flash_info intel_nor_parts[] = {
12-
{ "160s33b", INFO(0x898911, 0, 64 * 1024, 32)
13-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) },
14-
{ "320s33b", INFO(0x898912, 0, 64 * 1024, 64)
15-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) },
16-
{ "640s33b", INFO(0x898913, 0, 64 * 1024, 128)
17-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) },
12+
{
13+
.id = SNOR_ID(0x89, 0x89, 0x11),
14+
.name = "160s33b",
15+
.size = SZ_2M,
16+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
17+
}, {
18+
.id = SNOR_ID(0x89, 0x89, 0x12),
19+
.name = "320s33b",
20+
.size = SZ_4M,
21+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
22+
}, {
23+
.id = SNOR_ID(0x89, 0x89, 0x13),
24+
.name = "640s33b",
25+
.size = SZ_8M,
26+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
27+
}
1828
};
1929

2030
const struct spi_nor_manufacturer spi_nor_intel = {

0 commit comments

Comments
 (0)