From: Michael Walle <michael@walle.cc> To: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Miquel Raynal <miquel.raynal@bootlin.com>, Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Tudor Ambarus <tudor.ambarus@microchip.com>, Boris Brezillon <boris.brezillon@collabora.com>, Michael Walle <michael@walle.cc> Subject: [PATCH v8 5/7] mtd: spi-nor: intel: remove global protection flag Date: Thu, 3 Dec 2020 17:29:57 +0100 [thread overview] Message-ID: <20201203162959.29589-6-michael@walle.cc> (raw) In-Reply-To: <20201203162959.29589-1-michael@walle.cc> For the Atmel and SST parts this flag was already moved to individual flash parts because it is considered bad esp. because newer flash chips will automatically inherit the "has locking" support. While this won't likely be the case for the Intel parts, we do it for consistency reasons. Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> --- changes since v7 - none changes since v6 - none changes since v5 - new patch drivers/mtd/spi-nor/intel.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/mtd/spi-nor/intel.c b/drivers/mtd/spi-nor/intel.c index d8196f101368..6c31bef3fc60 100644 --- a/drivers/mtd/spi-nor/intel.c +++ b/drivers/mtd/spi-nor/intel.c @@ -10,23 +10,13 @@ static const struct flash_info intel_parts[] = { /* Intel/Numonyx -- xxxs33b */ - { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) }, - { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) }, - { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 0) }, -}; - -static void intel_default_init(struct spi_nor *nor) -{ - nor->flags |= SNOR_F_HAS_LOCK; -} - -static const struct spi_nor_fixups intel_fixups = { - .default_init = intel_default_init, + { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, SPI_NOR_HAS_LOCK) }, + { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, SPI_NOR_HAS_LOCK) }, + { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, SPI_NOR_HAS_LOCK) }, }; const struct spi_nor_manufacturer spi_nor_intel = { .name = "intel", .parts = intel_parts, .nparts = ARRAY_SIZE(intel_parts), - .fixups = &intel_fixups, }; -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Michael Walle <michael@walle.cc> To: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Vignesh Raghavendra <vigneshr@ti.com>, Tudor Ambarus <tudor.ambarus@microchip.com>, Richard Weinberger <richard@nod.at>, Michael Walle <michael@walle.cc>, Boris Brezillon <boris.brezillon@collabora.com>, Miquel Raynal <miquel.raynal@bootlin.com> Subject: [PATCH v8 5/7] mtd: spi-nor: intel: remove global protection flag Date: Thu, 3 Dec 2020 17:29:57 +0100 [thread overview] Message-ID: <20201203162959.29589-6-michael@walle.cc> (raw) In-Reply-To: <20201203162959.29589-1-michael@walle.cc> For the Atmel and SST parts this flag was already moved to individual flash parts because it is considered bad esp. because newer flash chips will automatically inherit the "has locking" support. While this won't likely be the case for the Intel parts, we do it for consistency reasons. Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> --- changes since v7 - none changes since v6 - none changes since v5 - new patch drivers/mtd/spi-nor/intel.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/mtd/spi-nor/intel.c b/drivers/mtd/spi-nor/intel.c index d8196f101368..6c31bef3fc60 100644 --- a/drivers/mtd/spi-nor/intel.c +++ b/drivers/mtd/spi-nor/intel.c @@ -10,23 +10,13 @@ static const struct flash_info intel_parts[] = { /* Intel/Numonyx -- xxxs33b */ - { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) }, - { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) }, - { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 0) }, -}; - -static void intel_default_init(struct spi_nor *nor) -{ - nor->flags |= SNOR_F_HAS_LOCK; -} - -static const struct spi_nor_fixups intel_fixups = { - .default_init = intel_default_init, + { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, SPI_NOR_HAS_LOCK) }, + { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, SPI_NOR_HAS_LOCK) }, + { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, SPI_NOR_HAS_LOCK) }, }; const struct spi_nor_manufacturer spi_nor_intel = { .name = "intel", .parts = intel_parts, .nparts = ARRAY_SIZE(intel_parts), - .fixups = &intel_fixups, }; -- 2.20.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-12-03 16:31 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-03 16:29 [PATCH v8 0/7] mtd: spi-nor: keep lock bits if they are non-volatile Michael Walle 2020-12-03 16:29 ` Michael Walle 2020-12-03 16:29 ` [PATCH v8 1/7] mtd: spi-nor: sst: fix BPn bits for the SST25VF064C Michael Walle 2020-12-03 16:29 ` Michael Walle 2020-12-03 16:29 ` [PATCH v8 2/7] mtd: spi-nor: ignore errors in spi_nor_unlock_all() Michael Walle 2020-12-03 16:29 ` Michael Walle 2020-12-03 16:29 ` [PATCH v8 3/7] mtd: spi-nor: atmel: remove global protection flag Michael Walle 2020-12-03 16:29 ` Michael Walle 2020-12-03 16:29 ` [PATCH v8 4/7] mtd: spi-nor: sst: " Michael Walle 2020-12-03 16:29 ` Michael Walle 2020-12-03 16:29 ` Michael Walle [this message] 2020-12-03 16:29 ` [PATCH v8 5/7] mtd: spi-nor: intel: " Michael Walle 2020-12-03 16:29 ` [PATCH v8 6/7] mtd: spi-nor: atmel: fix unlock_all() for AT25FS010/040 Michael Walle 2020-12-03 16:29 ` Michael Walle 2020-12-03 16:29 ` [PATCH v8 7/7] mtd: spi-nor: keep lock bits if they are non-volatile Michael Walle 2020-12-03 16:29 ` Michael Walle 2020-12-09 14:36 ` [PATCH v8 0/7] " Vignesh Raghavendra 2020-12-09 14:36 ` Vignesh Raghavendra
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201203162959.29589-6-michael@walle.cc \ --to=michael@walle.cc \ --cc=boris.brezillon@collabora.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=miquel.raynal@bootlin.com \ --cc=richard@nod.at \ --cc=tudor.ambarus@microchip.com \ --cc=vigneshr@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.