From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B61E5C433EF for ; Tue, 14 Sep 2021 23:06:36 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A97E8603E5 for ; Tue, 14 Sep 2021 23:06:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A97E8603E5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B676C81BC0; Wed, 15 Sep 2021 01:06:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (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=1631660794; bh=GZj7OxfeFm32gxeLLrljiS0fh3XnZHROPk39HSm3wvQ=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=vRCAg8bC+QZqFES5KVKDNo9SYZLRvGGjjARQBvotYvY9PtHkBaII+tBPOLKiDEh/G zrTrZ7aXc//rWGq0M02zWhEt/AvYmnBc8XbJWi9vF3tmaP8e4In3NziEfxI+keB8CQ dq+uZ3MyvKo5UFTC7gpuZvB9+Q1f/TWx9Cjr1+nx1tC32Qtfjo9OTw7cp41TglDuiG Jc394g6aCE/RM+i42pDvXquKKO84fQwxpsP5iWo7ios3r+WHttVt+M0r48OhHfUABA A6HVqWWPrq7LIK0ML3ea8UOrROi3Lj17ngdaVliH/B1oAQIwk3nSuSBhNsMOzpGC8g XXlS4AHinaTAQ== Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (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 61A3F8033E; Wed, 15 Sep 2021 01:06:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1631660790; bh=GZj7OxfeFm32gxeLLrljiS0fh3XnZHROPk39HSm3wvQ=; h=From:To:Cc:Subject:Date:From; b=xXBNbZV4l3rtU3YM8rFIjC8ypJHNrCVhZW4Zad4pbn7Mx02VMLAxFL76YIWJrT49T WXYiXyVS1870l8Z2UlY5R5Qh3c3vcVN+zmL4cmrtVl9AdutLcr1ipz1gssHxnqyOco Gn+VK2jkJ8SAu9R+Q2JnCG2LwqHXVSlONfvoiNEPus3LIZrlIQeMLlNL7uDQtbEIBZ SQ9X57ekgElJ5lIZNq5+RxOsK3bI6efc7MB31ExXnk7wvg0aCdF9eBt2XMDosMTi7e Y97zNsZtXL178wfEx7enBx9aruap/IYxgHynVZakHCMyLmYs2HOSL9hnAVZJlec6n9 2QZP5FoPbgQoA== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Heiko Schocher , Jagan Teki , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Miquel Raynal , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Patrice Chotard , Patrick Delaunay , Priyanka Jain , Simon Glass Subject: [PATCH] mtd: spi-nor: Fix SF MTDIDS when registering multiple MTDs with DM enabled Date: Wed, 15 Sep 2021 01:06:22 +0200 Message-Id: <20210914230622.245747-1-marex@denx.de> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean The flash->mtd.name used to be nor%d before, now it is the type of the SPI NOR like e.g. mt25ql02g. It is possible to find plenty of examples of the former in U-Boot configs by searching for MTDIDS.*nor.*spi, while the later is ambiguous if there are multiple flashes of the same type in the system and breaks existing environments. This does no longer get recognized when running 'mtdparts' for example: CONFIG_MTDIDS_DEFAULT="nor0=47040000.spi.0" Fix this by setting the correct mtd.name to nor%d. Fixes: b7f060565e3 ("mtd: spi-nor: allow registering multiple MTDs when DM is enabled") Signed-off-by: Marek Vasut Cc: Heiko Schocher Cc: Jagan Teki Cc: Marek Behún Cc: Miquel Raynal Cc: Pali Rohár Cc: Patrice Chotard Cc: Patrick Delaunay Cc: Priyanka Jain Cc: Simon Glass --- drivers/mtd/spi/sf_mtd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c index 04de8680809..1a81689fe4a 100644 --- a/drivers/mtd/spi/sf_mtd.c +++ b/drivers/mtd/spi/sf_mtd.c @@ -14,7 +14,10 @@ int spi_flash_mtd_register(struct spi_flash *flash) { - return add_mtd_device(&flash->mtd); + int ret = add_mtd_device(&flash->mtd); + if (!ret) + sprintf(flash->mtd.name, "nor%d", flash->mtd.index); + return ret; } void spi_flash_mtd_unregister(struct spi_flash *flash) -- 2.33.0