diff mbox series

[32/41] mtd: spi-nor: eon: sort flash_info database

Message ID	20230807-mtd-flash-info-db-rework-v1-32-3d3d5bef4ba4@kernel.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Michael Walle <mwalle@kernel.org> Date: Mon, 07 Aug 2023 15:21:26 +0200 Subject: [PATCH 32/41] mtd: spi-nor: eon: sort flash_info database MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230807-mtd-flash-info-db-rework-v1-32-3d3d5bef4ba4@kernel.org> References: <20230807-mtd-flash-info-db-rework-v1-0-3d3d5bef4ba4@kernel.org> In-Reply-To: <20230807-mtd-flash-info-db-rework-v1-0-3d3d5bef4ba4@kernel.org> To: Tudor Ambarus <tudor.ambarus@linaro.org>, Pratyush Yadav <pratyush@kernel.org>, Michael Walle <michael@walle.cc>, Miquel Raynal <miquel.raynal@bootlin.com>, Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com> Cc: linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Michael Walle <mwalle@kernel.org> Precedence: bulk
Series	mtd: spi-nor: clean the flash_info database up \| [00/41] mtd: spi-nor: clean the flash_info database up [01/41] mtd: spi-nor: remove catalyst 'flashes' [02/41] mtd: spi-nor: remove Fujitsu MB85RS1MT support [03/41] mtd: spi-nor: xilinx: use SPI_NOR_ID() in S3AN_INFO() [04/41] mtd: spi-nor: xilinx: remove addr_nbytes from S3AN_INFO() [05/41] mtd: spi-nor: convert .n_sectors to .size [06/41] mtd: spi-nor: default page_size to 256 bytes [07/41] mtd: spi-nor: store .n_banks in struct spi_nor_flash_parameter [08/41] mtd: spi-nor: default .n_banks to 1 [09/41] mtd: spi-nor: push 4k SE handling into spi_nor_select_uniform_erase() [10/41] mtd: spi-nor: make sector_size optional [11/41] mtd: spi-nor: drop .parse_sfdp [12/41] mtd: spi-nor: introduce (temporary) INFO0() [13/41] mtd: spi-nor: move the .id and .id_len into an own structure [14/41] mtd: spi-nor: rename .otp_org to .otp and make it a pointer [15/41] mtd: spi-nor: add SNOR_ID() and SNOR_OTP() [16/41] mtd: spi-nor: remove or move flash_info comments [17/41] mtd: spi-nor: atmel: convert flash_info to new format [18/41] mtd: spi-nor: eon: convert flash_info to new format [19/41] mtd: spi-nor: esmt: convert flash_info to new format [20/41] mtd: spi-nor: everspin: convert flash_info to new format [21/41] mtd: spi-nor: gigadevice: convert flash_info to new format [22/41] mtd: spi-nor: intel: convert flash_info to new format [23/41] mtd: spi-nor: issi: convert flash_info to new format [24/41] mtd: spi-nor: macronix: convert flash_info to new format [25/41] mtd: spi-nor: micron-st: convert flash_info to new format [26/41] mtd: spi-nor: spansion: convert flash_info to new format [27/41] mtd: spi-nor: sst: convert flash_info to new format [28/41] mtd: spi-nor: winbond: convert flash_info to new format [29/41] mtd: spi-nor: xilinx: use new macros in S3AN_INFO() [30/41] mtd: spi-nor: xmc: convert flash_info to new format [31/41] mtd: spi-nor: atmel: sort flash_info database [32/41] mtd: spi-nor: eon: sort flash_info database [33/41] mtd: spi-nor: gigadevice: sort flash_info database [34/41] mtd: spi-nor: issi: sort flash_info database [35/41] mtd: spi-nor: macronix: sort flash_info database [36/41] mtd: spi-nor: micron-st: sort flash_info database [37/41] mtd: spi-nor: spansion: sort flash_info database [38/41] mtd: spi-nor: sst: sort flash_info database [39/41] mtd: spi-nor: winbond: sort flash_info entries [40/41] mtd: spi-nor: atmel: drop duplicate entry [41/41] mtd: spi-nor: core: get rid of the INFOx() macros

Commit Message

Michael Walle Aug. 7, 2023, 1:21 p.m. UTC

  The flash ID is the new primary key into our database. Sort the entry by
it. Keep the most specific ones first, because there might be ID
collisions between shorter and longer ones.

Signed-off-by: Michael Walle <mwalle@kernel.org>
---
 drivers/mtd/spi-nor/eon.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff mbox series

Patch

diff --git a/drivers/mtd/spi-nor/eon.c b/drivers/mtd/spi-nor/eon.c
index ba09cb6c2abd..c1ddf662f782 100644
--- a/drivers/mtd/spi-nor/eon.c
+++ b/drivers/mtd/spi-nor/eon.c
@@ -10,32 +10,37 @@ 
 
 static const struct flash_info eon_nor_parts[] = {
 	{
-		.id = SNOR_ID(0x1c, 0x31, 0x16),
-		.name = "en25f32",
-		.size = SZ_4M,
-		.no_sfdp_flags = SECT_4K,
-	}, {
 		.id = SNOR_ID(0x1c, 0x20, 0x16),
 		.name = "en25p32",
 		.size = SZ_4M,
-	}, {
-		.id = SNOR_ID(0x1c, 0x30, 0x16),
-		.name = "en25q32b",
-		.size = SZ_4M,
 	}, {
 		.id = SNOR_ID(0x1c, 0x20, 0x17),
 		.name = "en25p64",
 		.size = SZ_8M,
+	}, {
+		.id = SNOR_ID(0x1c, 0x30, 0x14),
+		.name = "en25q80a",
+		.size = SZ_1M,
+		.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
+	}, {
+		.id = SNOR_ID(0x1c, 0x30, 0x16),
+		.name = "en25q32b",
+		.size = SZ_4M,
 	}, {
 		.id = SNOR_ID(0x1c, 0x30, 0x17),
 		.name = "en25q64",
 		.size = SZ_8M,
 		.no_sfdp_flags = SECT_4K,
 	}, {
-		.id = SNOR_ID(0x1c, 0x30, 0x14),
-		.name = "en25q80a",
-		.size = SZ_1M,
-		.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
+		.id = SNOR_ID(0x1c, 0x31, 0x16),
+		.name = "en25f32",
+		.size = SZ_4M,
+		.no_sfdp_flags = SECT_4K,
+	}, {
+		.name = "en25s64",
+		.id = SNOR_ID(0x1c, 0x38, 0x17),
+		.size = SZ_8M,
+		.no_sfdp_flags = SECT_4K,
 	}, {
 		.id = SNOR_ID(0x1c, 0x70, 0x15),
 		.name = "en25qh16",
@@ -57,11 +62,6 @@  static const struct flash_info eon_nor_parts[] = {
 	}, {
 		.id = SNOR_ID(0x1c, 0x70, 0x19),
 		.name = "en25qh256",
-	}, {
-		.name = "en25s64",
-		.id = SNOR_ID(0x1c, 0x38, 0x17),
-		.size = SZ_8M,
-		.no_sfdp_flags = SECT_4K,
 	},
 };