From patchwork Fri Sep 6 21:09:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1982082 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=uxdIYzBL; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=r/jBlQ/+; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X0plq0n0wz1y1D for ; Sat, 7 Sep 2024 07:10:15 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1A9F588D51; Fri, 6 Sep 2024 23:10:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1725657006; bh=MVAxerUvirdf2SBTYfonj2pNlo4PPGO1VpNWSJGKTBY=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=uxdIYzBLKdy8t62mZAoXjq2PtMcuaF+kyeek1afUPIUi7wxDeLZeC7yYjgxHe1OUU sUXsi6SDDzltEpkG6mCW75bUOfl3Y54B+K5ecDIZ2dJHwSeGxi9m3jn/vrZekFrznM xrMNE0wGVzSP+si8Muedr4ewUKpQvmdubvMZp57JDUbZKZfmJS4r3jWr7rQnqkpaec qdKzaV2NXXIjfUkp7dJob6Vr//BdN862F1c/u5NyHu67pqfkv3rqWr6hbkWfj8LD4l 4p15JzIt1hx/lBQrVUFDFwFFXJFlYMUu3B6z3yiwr5323R7f7ki8op0x5NfzmVqZ4n yuUvolZgeLSoA== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 7585588D4E; Fri, 6 Sep 2024 23:10:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1725657005; bh=MVAxerUvirdf2SBTYfonj2pNlo4PPGO1VpNWSJGKTBY=; h=From:To:Cc:Subject:Date:From; b=r/jBlQ/+tgGlATGa1ju3Mim8xqkW4X8XltxlJG7vDmmOm7Jsr5aClkw7AtG3SNQxa qShcYVkBBl8BI1JAzoT+Gy+yfp0xW/htQilBCJ04G12jIpQxuNZCLPXDieKKGx8gIL wEr8uHhspE/Q5r1JsEAU7pbVE+3spEBsiwJa9A6T2yCIgvdcp3I9pSLKdlXWcQTrmB 1wWfyJiemgU9Bf52tLGi9DhfpFM+xZipG6jwDpdG8mWaK299FIitmzmzjAL13W/FXT ez0ElWUnIHUQtCRg8hnmPU2p4ID1aS032CgWCEcdzYikcrQ/Pv0d2UcHGrKWz+n8P+ drVOuB9SvFajg== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Andre Przywara , Ashok Reddy Soma , Dhruva Gole , Jagan Teki , Jim Liu , Jonas Karlman , Michal Simek , Neal Frager , Prasad Kummari , Teik Heng Chong , Tom Rini , Vignesh R Subject: [PATCH] mtd: spi-nor-ids: Deduplicate w25q16dw entry Date: Fri, 6 Sep 2024 23:09:16 +0200 Message-ID: <20240906210951.193142-1-marex@denx.de> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The w25q16dw entry exists twice in spi_nor_ids, remove the less complete variant of the entry and keep only one copy of it. Fixes: baef13ec9d59 ("mtd: spi-nor-ids: Add support for flashes tested by xilinx") Signed-off-by: Marek Vasut Reviewed-by: Michal Simek Reviewed-by: Tudor Ambarus --- Cc: Andre Przywara Cc: Ashok Reddy Soma Cc: Dhruva Gole Cc: Jagan Teki Cc: Jim Liu Cc: Jonas Karlman Cc: Michal Simek Cc: Neal Frager Cc: Prasad Kummari Cc: Teik Heng Chong Cc: Tom Rini Cc: Vignesh R Cc: u-boot@lists.denx.de --- drivers/mtd/spi/spi-nor-ids.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index 88709a52b3a..d1389e681d6 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -430,11 +430,6 @@ const struct flash_info spi_nor_ids[] = { { INFO("w25x05", 0xef3010, 0, 64 * 1024, 1, SECT_4K) }, { INFO("w25x40", 0xef3013, 0, 64 * 1024, 8, SECT_4K) }, { INFO("w25x16", 0xef3015, 0, 64 * 1024, 32, SECT_4K) }, - { - INFO("w25q16dw", 0xef6015, 0, 64 * 1024, 32, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | - SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) - }, { INFO("w25x32", 0xef3016, 0, 64 * 1024, 64, SECT_4K) }, { INFO("w25q20cl", 0xef4012, 0, 64 * 1024, 4, SECT_4K) }, { INFO("w25q20bw", 0xef5012, 0, 64 * 1024, 4, SECT_4K) }, @@ -442,7 +437,8 @@ const struct flash_info spi_nor_ids[] = { { INFO("w25q32", 0xef4016, 0, 64 * 1024, 64, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { INFO("w25q16dw", 0xef6015, 0, 64 * 1024, 32, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | + SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, { INFO("w25q32dw", 0xef6016, 0, 64 * 1024, 64,