mtd: spi-nor: default .n_banks to 1

If .n_banks is not set in the flash_info database, the default value
should be 1. This way, we don't have to always set the .n_banks
parameter in flash_info.

Signed-off-by: Michael Walle <mwalle@kernel.org>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v3-8-e60548861b10@kernel.org
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>

diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index e27f1323fa0b33c9f1f8196d377ade8c5db552e4..68baf6032639c11d4dedd93de0a03c383451c360 100644 (file)
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -2017,7 +2017,6 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
 
 static const struct flash_info spi_nor_generic_flash = {
        .name = "spi-nor-generic",
-       .n_banks = 1,
        .parse_sfdp = true,
 };
 
@@ -2997,7 +2996,7 @@ static void spi_nor_init_default_params(struct spi_nor *nor)
        params->size = info->size;
        params->bank_size = params->size;
        params->page_size = info->page_size ?: SPI_NOR_DEFAULT_PAGE_SIZE;
-       params->n_banks = info->n_banks;
+       params->n_banks = info->n_banks ?: SPI_NOR_DEFAULT_N_BANKS;
 
        if (!(info->flags & SPI_NOR_NO_FR)) {
                /* Default to Fast Read for DT and non-DT platform devices. */

diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
index 2fc999f2787cd5759589da0cc06f78621d08c428..8627d0b95be62e6b8bb371c4965b1a79891b7911 100644 (file)
--- a/drivers/mtd/spi-nor/core.h
+++ b/drivers/mtd/spi-nor/core.h
@@ -15,6 +15,7 @@
  * have the page size defined within their SFDP tables.
  */
 #define SPI_NOR_DEFAULT_PAGE_SIZE 256
+#define SPI_NOR_DEFAULT_N_BANKS 1
 
 /* Standard SPI NOR flash operations. */
 #define SPI_NOR_READID_OP(naddr, ndummy, buf, len)                     \
@@ -453,7 +454,7 @@ struct spi_nor_fixups {
  * @size:           the size of the flash in bytes.
  * @sector_size:    the size listed here is what works with SPINOR_OP_SE, which
  *                  isn't necessarily called a "sector" by the vendor.
- * @n_banks:        the number of banks.
+ * @n_banks:        (optional) the number of banks. Defaults to 1.
  * @page_size:      (optional) the flash's page size. Defaults to 256.
  * @addr_nbytes:    number of address bytes to send.
  *
@@ -570,7 +571,7 @@ struct flash_info {
 /* Used when the "_ext_id" is two bytes at most */
 #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors)             \
        SPI_NOR_ID((_jedec_id), (_ext_id)),                             \
-       SPI_NOR_GEOMETRY((_sector_size), (_n_sectors), 1),
+       SPI_NOR_GEOMETRY((_sector_size), (_n_sectors), 0),
 
 #define INFOB(_jedec_id, _ext_id, _sector_size, _n_sectors, _n_banks)  \
        SPI_NOR_ID((_jedec_id), (_ext_id)),                             \
@@ -578,13 +579,12 @@ struct flash_info {
 
 #define INFO6(_jedec_id, _ext_id, _sector_size, _n_sectors)            \
        SPI_NOR_ID6((_jedec_id), (_ext_id)),                            \
-       SPI_NOR_GEOMETRY((_sector_size), (_n_sectors), 1),
+       SPI_NOR_GEOMETRY((_sector_size), (_n_sectors), 0),
 
 #define CAT25_INFO(_sector_size, _n_sectors, _page_size, _addr_nbytes) \
                .size = (_sector_size) * (_n_sectors),                  \
                .sector_size = (_sector_size),                          \
                .page_size = (_page_size),                              \
-               .n_banks = 1,                                           \
                .addr_nbytes = (_addr_nbytes),                          \
                .flags = SPI_NOR_NO_ERASE | SPI_NOR_NO_FR,              \
 

diff --git a/drivers/mtd/spi-nor/xilinx.c b/drivers/mtd/spi-nor/xilinx.c
index 284e2e4970ab7a383f62537a25fb82c4e4ce6a80..8d4539e32dfe0ac2aeebea9b261e08335c6accd9 100644 (file)
--- a/drivers/mtd/spi-nor/xilinx.c
+++ b/drivers/mtd/spi-nor/xilinx.c
@@ -26,7 +26,6 @@
                .size = 8 * (_page_size) * (_n_sectors),                \
                .sector_size = (8 * (_page_size)),                      \
                .page_size = (_page_size),                              \
-               .n_banks = 1,                                           \
                .flags = SPI_NOR_NO_FR
 
 /* Xilinx S3AN share MFR with Atmel SPI NOR */