summaryrefslogtreecommitdiff
path: root/drivers/mtd/spi-nor/micron-st.c
diff options
context:
space:
mode:
authorMichael Walle <mwalle@kernel.org>2023-09-08 13:16:30 +0300
committerTudor Ambarus <tudor.ambarus@linaro.org>2023-09-19 18:57:50 +0300
commit95c6e3d26691d9144bfa3cdb95962bdb24d98905 (patch)
tree9c2ff60175ce49a229a95f87d9338bd5b41741cd /drivers/mtd/spi-nor/micron-st.c
parent3ea3f0ac242c86c0275d347ab8c92bf1eb854b49 (diff)
downloadlinux-95c6e3d26691d9144bfa3cdb95962bdb24d98905.tar.xz
mtd: spi-nor: introduce (temporary) INFO0()
The id will be converted to an own structure. To differentiate between flashes with and without IDs, introduce a temporary macro INFO0() and convert all flashes with no ID to use it. The difference between INFO0() and INFOx() is that the former, doesn't have a pointer to the id structure. Something which isn't possible to do within the INFOx() macro. After the flash_info conversion, that macro will be removed along with all the other INFOx() macros. Signed-off-by: Michael Walle <mwalle@kernel.org> Link: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v3-12-e60548861b10@kernel.org Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Diffstat (limited to 'drivers/mtd/spi-nor/micron-st.c')
-rw-r--r--drivers/mtd/spi-nor/micron-st.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mtd/spi-nor/micron-st.c b/drivers/mtd/spi-nor/micron-st.c
index 6ad080c52ab5..5406a3af2ce0 100644
--- a/drivers/mtd/spi-nor/micron-st.c
+++ b/drivers/mtd/spi-nor/micron-st.c
@@ -272,15 +272,15 @@ static const struct flash_info st_nor_parts[] = {
{ "m25p64", INFO(0x202017, 0, 64 * 1024, 128) },
{ "m25p128", INFO(0x202018, 0, 256 * 1024, 64) },
- { "m25p05-nonjedec", INFO(0, 0, 32 * 1024, 2) },
- { "m25p10-nonjedec", INFO(0, 0, 32 * 1024, 4) },
- { "m25p20-nonjedec", INFO(0, 0, 64 * 1024, 4) },
- { "m25p40-nonjedec", INFO(0, 0, 64 * 1024, 8) },
- { "m25p80-nonjedec", INFO(0, 0, 64 * 1024, 16) },
- { "m25p16-nonjedec", INFO(0, 0, 64 * 1024, 32) },
- { "m25p32-nonjedec", INFO(0, 0, 64 * 1024, 64) },
- { "m25p64-nonjedec", INFO(0, 0, 64 * 1024, 128) },
- { "m25p128-nonjedec", INFO(0, 0, 256 * 1024, 64) },
+ { "m25p05-nonjedec", INFO0( 32 * 1024, 2) },
+ { "m25p10-nonjedec", INFO0( 32 * 1024, 4) },
+ { "m25p20-nonjedec", INFO0( 64 * 1024, 4) },
+ { "m25p40-nonjedec", INFO0( 64 * 1024, 8) },
+ { "m25p80-nonjedec", INFO0( 64 * 1024, 16) },
+ { "m25p16-nonjedec", INFO0( 64 * 1024, 32) },
+ { "m25p32-nonjedec", INFO0( 64 * 1024, 64) },
+ { "m25p64-nonjedec", INFO0( 64 * 1024, 128) },
+ { "m25p128-nonjedec", INFO0(256 * 1024, 64) },
{ "m45pe10", INFO(0x204011, 0, 64 * 1024, 2) },
{ "m45pe80", INFO(0x204014, 0, 64 * 1024, 16) },