From nobody Wed Dec 17 10:42:38 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8B1FEE49A5 for ; Tue, 22 Aug 2023 07:11:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233299AbjHVHLU (ORCPT ); Tue, 22 Aug 2023 03:11:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233313AbjHVHLF (ORCPT ); Tue, 22 Aug 2023 03:11:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FB21CCA for ; Tue, 22 Aug 2023 00:10:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6881E64D7C for ; Tue, 22 Aug 2023 07:10:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28BF8C433CC; Tue, 22 Aug 2023 07:10:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692688216; bh=1nkVQlo/pntUPcuI8tZ3St9xyXgZLdanptrUEPEewkQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LFoG8gSTkoJhFzHczhh0BgG1vvx1AhRxcZ6OoMDfYKnXyyyhpwNUEYjCA9ve1azqj 8LtnjVqRwEjf9GLtLDdXOGd94DJBgRxvEW7BAkFDsknGu5IX9US1erettBCjRCTXcz mU7krvqFmZcLSG24J6SH3LTW0ii5F1divg0Rrq9lQA/wUTd6K8TIcmcsjb3gWoui9O HghvIeUnwzAKnyQZCvXXHDYSi8CondZsc3Doh5fl8EIRYW9tMHVLtjv6ayeYZMvyyP UqPPXMBk6stxJB8TlbWd7k/IrnHK6MmxZejXcxL0aw2/Y12K2xvwKLqgyHgSK/cs/K YAByhxOkqJbSA== From: Michael Walle Date: Tue, 22 Aug 2023 09:09:36 +0200 Subject: [PATCH v2 20/41] mtd: spi-nor: everspin: convert flash_info to new format MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230807-mtd-flash-info-db-rework-v2-20-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 , Pratyush Yadav , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra Cc: linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Michael Walle X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The INFOx() macros are going away. Convert the flash_info database to the new format. Signed-off-by: Michael Walle --- drivers/mtd/spi-nor/everspin.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi-nor/everspin.c b/drivers/mtd/spi-nor/everspin.c index d02c32f2f7ad..46776bc10b27 100644 --- a/drivers/mtd/spi-nor/everspin.c +++ b/drivers/mtd/spi-nor/everspin.c @@ -9,10 +9,35 @@ #include "core.h" =20 static const struct flash_info everspin_nor_parts[] =3D { - { "mr25h128", CAT25_INFO(16 * 1024, 1, 256, 2) }, - { "mr25h256", CAT25_INFO(32 * 1024, 1, 256, 2) }, - { "mr25h10", CAT25_INFO(128 * 1024, 1, 256, 3) }, - { "mr25h40", CAT25_INFO(512 * 1024, 1, 256, 3) }, + { + .name =3D "mr25h128", + .size =3D SZ_16K, + .sector_size =3D SZ_16K, + .page_size =3D 256, + .addr_nbytes =3D 2, + .flags =3D SPI_NOR_NO_ERASE | SPI_NOR_NO_FR, + }, { + .name =3D "mr25h256", + .size =3D SZ_32K, + .sector_size =3D SZ_32K, + .page_size =3D 256, + .addr_nbytes =3D 2, + .flags =3D SPI_NOR_NO_ERASE | SPI_NOR_NO_FR, + }, { + .name =3D "mr25h10", + .size =3D SZ_128K, + .sector_size =3D SZ_128K, + .page_size =3D 256, + .addr_nbytes =3D 3, + .flags =3D SPI_NOR_NO_ERASE | SPI_NOR_NO_FR, + }, { + .name =3D "mr25h40", + .size =3D SZ_512K, + .sector_size =3D SZ_512K, + .page_size =3D 256, + .addr_nbytes =3D 3, + .flags =3D SPI_NOR_NO_ERASE | SPI_NOR_NO_FR, + } }; =20 const struct spi_nor_manufacturer spi_nor_everspin =3D { --=20 2.39.2