summaryrefslogtreecommitdiff
path: root/drivers/mtd/spi-nor/xmc.c
diff options
context:
space:
mode:
authorMichael Walle <mwalle@kernel.org>2023-09-08 13:16:48 +0300
committerTudor Ambarus <tudor.ambarus@linaro.org>2023-09-19 18:59:20 +0300
commit9e02cb5b1d09705db1a19ef20c5bfdd38237efca (patch)
treea47b6bf495b77fc3413f0cf1da925eaddc64066c /drivers/mtd/spi-nor/xmc.c
parent8e52f54ca9946e0a67e2199a05ca68251de29a95 (diff)
downloadlinux-9e02cb5b1d09705db1a19ef20c5bfdd38237efca.tar.xz
mtd: spi-nor: xmc: 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-30-e60548861b10@kernel.org Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Diffstat (limited to 'drivers/mtd/spi-nor/xmc.c')
-rw-r--r--drivers/mtd/spi-nor/xmc.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/mtd/spi-nor/xmc.c b/drivers/mtd/spi-nor/xmc.c
index 48062ccb22fa..d5a06054b0dd 100644
--- a/drivers/mtd/spi-nor/xmc.c
+++ b/drivers/mtd/spi-nor/xmc.c
@@ -9,12 +9,17 @@
#include "core.h"
static const struct flash_info xmc_nor_parts[] = {
- { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128)
- NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ |
- SPI_NOR_QUAD_READ) },
- { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256)
- NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ |
- SPI_NOR_QUAD_READ) },
+ {
+ .id = SNOR_ID(0x20, 0x70, 0x17),
+ .name = "XM25QH64A",
+ .size = SZ_8M,
+ .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
+ }, {
+ .id = SNOR_ID(0x20, 0x70, 0x18),
+ .name = "XM25QH128A",
+ .size = SZ_16M,
+ .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
+ },
};
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */