From nobody Wed Dec 17 10:42:40 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 369F8EE49A8 for ; Tue, 22 Aug 2023 07:12:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229782AbjHVHMo (ORCPT ); Tue, 22 Aug 2023 03:12:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233399AbjHVHMG (ORCPT ); Tue, 22 Aug 2023 03:12:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B02361B0 for ; Tue, 22 Aug 2023 00:11: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 39F7864CC7 for ; Tue, 22 Aug 2023 07:10:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BB66C433BC; Tue, 22 Aug 2023 07:10:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692688220; bh=pG2FdGd2bZ50xpBr1ZIaO+fF4bmW9tYC4LsRjQC4xQA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AoMaX57tssEMHT7Lw/b1VgFDu/uH21dVi3RRPacPIp9oLcnrUliyNANPdFyDYBMzl sL5XNZYaKUpmo4JKg2GgaM8/Gc3Jch/Bkgxz4Jlyn1ORuH+xVnpJ9fH+HAefGIZb6g RIW6d+rNRgPiVsJJWqfwljf65Cd7v2HXvUcwf6vzL9gVnLrWX42/hzIzIEG2dfho9Z KnPXlT8NYWhl2Aqpp1helhHCoGW871VfnmEcCghEefgGUtKD/Ewknthprj5RSWkadv t+GE9EpgHyVkINzZNKcJojlEA3ZuxYFc3bLD9jkFDFB+Ri5b7jtY6nTZjy13x5nehJ Kmup4dPWR3zvw== From: Michael Walle Date: Tue, 22 Aug 2023 09:09:38 +0200 Subject: [PATCH v2 22/41] mtd: spi-nor: intel: 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-22-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/intel.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/spi-nor/intel.c b/drivers/mtd/spi-nor/intel.c index aba62759a02e..f647359fee7a 100644 --- a/drivers/mtd/spi-nor/intel.c +++ b/drivers/mtd/spi-nor/intel.c @@ -9,12 +9,22 @@ #include "core.h" =20 static const struct flash_info intel_nor_parts[] =3D { - { "160s33b", INFO(0x898911, 0, 64 * 1024, 32) - FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) }, - { "320s33b", INFO(0x898912, 0, 64 * 1024, 64) - FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) }, - { "640s33b", INFO(0x898913, 0, 64 * 1024, 128) - FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE) }, + { + .id =3D SNOR_ID(0x89, 0x89, 0x11), + .name =3D "160s33b", + .size =3D SZ_2M, + .flags =3D SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE, + }, { + .id =3D SNOR_ID(0x89, 0x89, 0x12), + .name =3D "320s33b", + .size =3D SZ_4M, + .flags =3D SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE, + }, { + .id =3D SNOR_ID(0x89, 0x89, 0x13), + .name =3D "640s33b", + .size =3D SZ_8M, + .flags =3D SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE, + } }; =20 const struct spi_nor_manufacturer spi_nor_intel =3D { --=20 2.39.2