diff mbox series

[v2,40/41] mtd: spi-nor: atmel: drop duplicate entry

Message ID	20230807-mtd-flash-info-db-rework-v2-40-291a0f39f8d8@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: Tue, 22 Aug 2023 09:09:56 +0200 Subject: [PATCH v2 40/41] mtd: spi-nor: atmel: drop duplicate entry MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230807-mtd-flash-info-db-rework-v2-40-291a0f39f8d8@kernel.org> References: <20230807-mtd-flash-info-db-rework-v2-0-291a0f39f8d8@kernel.org> In-Reply-To: <20230807-mtd-flash-info-db-rework-v2-0-291a0f39f8d8@kernel.org> To: Tudor Ambarus <tudor.ambarus@linaro.org>, Pratyush Yadav <pratyush@kernel.org>, 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 \| [v2,00/41] mtd: spi-nor: clean the flash_info database up [v2,01/41] mtd: spi-nor: remove catalyst 'flashes' [v2,02/41] mtd: spi-nor: remove Fujitsu MB85RS1MT support [v2,03/41] mtd: spi-nor: xilinx: use SPI_NOR_ID() in S3AN_INFO() [v2,04/41] mtd: spi-nor: xilinx: remove addr_nbytes from S3AN_INFO() [v2,06/41] mtd: spi-nor: default page_size to 256 bytes [v2,07/41] mtd: spi-nor: store .n_banks in struct spi_nor_flash_parameter [v2,09/41] mtd: spi-nor: push 4k SE handling into spi_nor_select_uniform_erase() [v2,10/41] mtd: spi-nor: make sector_size optional [v2,11/41] mtd: spi-nor: drop .parse_sfdp [v2,12/41] mtd: spi-nor: introduce (temporary) INFO0() [v2,13/41] mtd: spi-nor: move the .id and .id_len into an own structure [v2,14/41] mtd: spi-nor: rename .otp_org to .otp and make it a pointer [v2,15/41] mtd: spi-nor: add SNOR_ID() and SNOR_OTP() [v2,16/41] mtd: spi-nor: remove or move flash_info comments [v2,17/41] mtd: spi-nor: atmel: convert flash_info to new format [v2,18/41] mtd: spi-nor: eon: convert flash_info to new format [v2,19/41] mtd: spi-nor: esmt: convert flash_info to new format [v2,20/41] mtd: spi-nor: everspin: convert flash_info to new format [v2,21/41] mtd: spi-nor: gigadevice: convert flash_info to new format [v2,22/41] mtd: spi-nor: intel: convert flash_info to new format [v2,24/41] mtd: spi-nor: macronix: convert flash_info to new format [v2,25/41] mtd: spi-nor: micron-st: convert flash_info to new format [v2,26/41] mtd: spi-nor: spansion: convert flash_info to new format [v2,28/41] mtd: spi-nor: winbond: convert flash_info to new format [v2,29/41] mtd: spi-nor: xilinx: use new macros in S3AN_INFO() [v2,30/41] mtd: spi-nor: xmc: convert flash_info to new format [v2,31/41] mtd: spi-nor: atmel: sort flash_info database [v2,32/41] mtd: spi-nor: eon: sort flash_info database [v2,34/41] mtd: spi-nor: issi: sort flash_info database [v2,35/41] mtd: spi-nor: macronix: sort flash_info database [v2,36/41] mtd: spi-nor: micron-st: sort flash_info database [v2,37/41] mtd: spi-nor: spansion: sort flash_info database [v2,38/41] mtd: spi-nor: sst: sort flash_info database [v2,39/41] mtd: spi-nor: winbond: sort flash_info entries [v2,40/41] mtd: spi-nor: atmel: drop duplicate entry [v2,41/41] mtd: spi-nor: core: get rid of the INFOx() macros

Commit Message

Michael Walle Aug. 22, 2023, 7:09 a.m. UTC

  The Atmel AT26DF321 and AT25DF321 have the same ID. Both were just
discovered by reading their IDs, that is, there is no probing by name.
Thus only the first one in the list was ever probed. The AT25DF is the
newer series. Drop the older one.

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

diff mbox series

Patch

diff --git a/drivers/mtd/spi-nor/atmel.c b/drivers/mtd/spi-nor/atmel.c
index 18e904962d0e..95f0e139284e 100644
--- a/drivers/mtd/spi-nor/atmel.c
+++ b/drivers/mtd/spi-nor/atmel.c
@@ -206,13 +206,6 @@  static const struct flash_info atmel_nor_parts[] = {
 		.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
 		.no_sfdp_flags = SECT_4K,
 		.fixups = &atmel_nor_global_protection_fixups
-	}, {
-		.id = SNOR_ID(0x1f, 0x47, 0x00),
-		.name = "at26df321",
-		.size = SZ_4M,
-		.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
-		.no_sfdp_flags = SECT_4K,
-		.fixups = &atmel_nor_global_protection_fixups
 	}, {
 		.id = SNOR_ID(0x1f, 0x47, 0x01),
 		.name = "at25df321a",