From: Cheng Ming Lin <linchengming884@gmail.com>
To: tudor.ambarus@linaro.org, pratyush@kernel.org, mwalle@kernel.org,
miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com,
linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: alvinzhou@mxic.com.tw, leoyu@mxic.com.tw,
Cheng Ming Lin <chengminglin@mxic.com.tw>
Subject: [PATCH 3/3] mtd: spi-nor: macronix: Move macronix_nor_default_init logic to macronix_nor_late_init
Date: Wed, 2 Apr 2025 16:51:29 +0800 [thread overview]
Message-ID: <20250402085129.1027670-4-linchengming884@gmail.com> (raw)
In-Reply-To: <20250402085129.1027670-1-linchengming884@gmail.com>
From: Cheng Ming Lin <chengminglin@mxic.com.tw>
Remove macronix_nor_default_init and move its functionality to
macronix_nor_late_init to ensure proper quad_enable initialization.
For MX25L3255E, SFDP follows JESD216, which does not include the Quad
Enable bit Requirements field in its version. When the size field is
removed, manufacturer->fixups->default_init hook is not executed, causing
params->quad_enable not being overwritten with the intended function.
Consequently, it remains as the default spi_nor_sr2_bit1_quad_enable.
By moving quad_enable setup from default_init to late_init, quad_enable
is correctly assigned after spi_nor_init_params, regardless of the size
field removal.
Additionally, according to spi-nor/core.h, quad_enable is more
appropriately placed in late_init, as older SFDP versions did not define
the Quad Enable bit Requirements. This change removes default_init and
moves quad_enable handling to late_init accordingly.
Signed-off-by: Cheng Ming Lin <chengminglin@mxic.com.tw>
---
drivers/mtd/spi-nor/macronix.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/mtd/spi-nor/macronix.c b/drivers/mtd/spi-nor/macronix.c
index 07e0bd0b70a0..216c02b92bfe 100644
--- a/drivers/mtd/spi-nor/macronix.c
+++ b/drivers/mtd/spi-nor/macronix.c
@@ -282,22 +282,17 @@ static int macronix_nor_set_octal_dtr(struct spi_nor *nor, bool enable)
return enable ? macronix_nor_octal_dtr_en(nor) : macronix_nor_octal_dtr_dis(nor);
}
-static void macronix_nor_default_init(struct spi_nor *nor)
-{
- nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable;
-}
-
static int macronix_nor_late_init(struct spi_nor *nor)
{
if (!nor->params->set_4byte_addr_mode)
nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode_en4b_ex4b;
+ nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable;
nor->params->set_octal_dtr = macronix_nor_set_octal_dtr;
return 0;
}
static const struct spi_nor_fixups macronix_nor_fixups = {
- .default_init = macronix_nor_default_init,
.late_init = macronix_nor_late_init,
};
--
2.25.1
next prev parent reply other threads:[~2025-04-02 8:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-02 8:51 [PATCH 0/3] mtd: spi-nor: macronix: Cleanup macronix flash info Cheng Ming Lin
2025-04-02 8:51 ` [PATCH 1/3] mtd: spi-nor: macronix: Drop the redundant flash info fields Cheng Ming Lin
2025-04-02 12:03 ` Tudor Ambarus
2025-04-02 8:51 ` [PATCH 2/3] mtd: spi-nor: macronix: Remove duplicate flash info entries Cheng Ming Lin
2025-04-02 12:05 ` Tudor Ambarus
2025-04-02 8:51 ` Cheng Ming Lin [this message]
2025-04-02 12:10 ` [PATCH 3/3] mtd: spi-nor: macronix: Move macronix_nor_default_init logic to macronix_nor_late_init Tudor Ambarus
2025-04-02 12:17 ` Cheng Ming Lin
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=20250402085129.1027670-4-linchengming884@gmail.com \
--to=linchengming884@gmail.com \
--cc=alvinzhou@mxic.com.tw \
--cc=chengminglin@mxic.com.tw \
--cc=leoyu@mxic.com.tw \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=mwalle@kernel.org \
--cc=pratyush@kernel.org \
--cc=richard@nod.at \
--cc=tudor.ambarus@linaro.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®