Message ID | 20230807-mtd-flash-info-db-rework-v2-30-291a0f39f8d8@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp3558419vqi; Tue, 22 Aug 2023 04:31:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/P3302uUmHrlZLNA2gWOzpA8EZzhuvtSmcr7FyJomnDcXNCLmR+3wOikSV4/Vy4XMQL5y X-Received: by 2002:a05:6a20:9684:b0:132:965d:5323 with SMTP id hp4-20020a056a20968400b00132965d5323mr6050446pzc.33.1692703887101; Tue, 22 Aug 2023 04:31:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692703887; cv=none; d=google.com; s=arc-20160816; b=OezpGSiMFZGETcqX73YxDu3R6PQeRcLKwlfPLLagbAJ+btnLcBI6aogdhxBxXqiG9Y ES95WeGDviRFhiP5tHO2hHWS07GUaQVucfHGGDUZyE5hlg3O5gt90VHhmga7WGLfiDq1 1gWi6Y7rDYODFl8KYMN+zBwJl3E9yoEZr7oL+lPJmKF9KSUIRonwdTO2bHFpyxl7rmMC OTzK12jgM1R4j4S0iEeWHH4iX2x4dusgfOtqcBrIP6HSF5AZtysVO5bJ42an9iLH4ze9 51k6xsk006AY7H84eXWF+01OTEJ0eCDatqpIspXA2B7TrmNhYE0CzJ/vI3mZqfpggipx AX/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=gBCpuVU/pd44YCVNRKiXUy+CVJBTcFq+JBSIfZh7EkM=; fh=sGokzmqN/xaL6jGbf+JSrC0JTDwjZ5He1xJ0SScZpXk=; b=GoBLBh78/xDXVcDhEBk/4UpxhL8K8Mt2FpxwpwD7P3qFmmcMhHvQ+mCTqMpMTD7VeC 2cXaHdy66UIwk9CFSFrG6vUWb4MhtrlEMC6MbGim4fUS1Ey8bOnpDDdEQMfA7MnHVXsy QdPtVKDEmusnHi52E0gzvzNpxz2wInNfaVmDnyvB5ND7qhkr7EACl9MnZNkyVU+t2JdS MQQ8GfI+6kwVtm+l7Tm+epAtjsMzoGYnQ9T++aSTWRxelhehKWkakNPSlTBNQoYz0nuS JewTNjRD+yLjYGmDpDDxa9PO5hvnNoVk4ww3ubKu9r5doJ1a2z4fY+RpD5mDoa8nJfRQ +uIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nOGo3pil; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cu2-20020a056a00448200b006875bd6d8d9si8737443pfb.169.2023.08.22.04.31.12; Tue, 22 Aug 2023 04:31:27 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nOGo3pil; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233403AbjHVHLq (ORCPT <rfc822;kjyul0303@gmail.com> + 99 others); Tue, 22 Aug 2023 03:11:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233375AbjHVHL2 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 22 Aug 2023 03:11:28 -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 1E46E1B0 for <linux-kernel@vger.kernel.org>; Tue, 22 Aug 2023 00:11:03 -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 E5A8264861 for <linux-kernel@vger.kernel.org>; Tue, 22 Aug 2023 07:10:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8336C433C7; Tue, 22 Aug 2023 07:10:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692688236; bh=qrtlb3Inp+0PAFufVQ6/JFPnxSSyzXyjdaLgPSqbaiA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nOGo3pil1/gkWPoExVzoflFCYD8btxkzwg/oQ6hr6HF8V5/ZWffWM9tKR8/oTQl28 gDrwIfDZoIlTeVhOvaisvBS0f3QSbxNQ1GviHgyfrSRepxP9nIzhCzFNxMHeGvp9db RG8F0Zpn/Zv4/GSPp/vwryzpsLbhCfDqn3dPQMHfmirXQjXz8C2YwWSesG5mCiDqSY rU1FhfhzBWT2sUBNWDryLg1V03VuIShWsc5GNrQ650Doc0oD6EBIhLFOS21KZP6rC8 5sVJKLnWsMWPxVq5uwb3M3BF3caVb7tV5wqi+UH2nW6wl2b9R/HFjA1HOWKV3kQqPb aZDZBtLfqKxHg== From: Michael Walle <mwalle@kernel.org> Date: Tue, 22 Aug 2023 09:09:46 +0200 Subject: [PATCH v2 30/41] mtd: spi-nor: xmc: convert flash_info to new format MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230807-mtd-flash-info-db-rework-v2-30-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> X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774928671172603043 X-GMAIL-MSGID: 1774928671172603043 |
Series |
mtd: spi-nor: clean the flash_info database up
|
|
Commit Message
Michael Walle
Aug. 22, 2023, 7:09 a.m. UTC
The INFOx() macros are going away. Convert the flash_info database to
the new format.
Signed-off-by: Michael Walle <mwalle@kernel.org>
---
drivers/mtd/spi-nor/xmc.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/mtd/spi-nor/xmc.c b/drivers/mtd/spi-nor/xmc.c index 48062ccb22fa..d5a06054b0dd 100644 --- a/drivers/mtd/spi-nor/xmc.c +++ b/drivers/mtd/spi-nor/xmc.c @@ -9,12 +9,17 @@ #include "core.h" static const struct flash_info xmc_nor_parts[] = { - { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128) - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | - SPI_NOR_QUAD_READ) }, - { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256) - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | - SPI_NOR_QUAD_READ) }, + { + .id = SNOR_ID(0x20, 0x70, 0x17), + .name = "XM25QH64A", + .size = SZ_8M, + .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ, + }, { + .id = SNOR_ID(0x20, 0x70, 0x18), + .name = "XM25QH128A", + .size = SZ_16M, + .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ, + }, }; /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */