mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Christophe Kerello <christophe.kerello@foss.st.com>
To: <miquel.raynal@bootlin.com>, <richard@nod.at>, <vigneshr@ti.com>,
	<krzysztof.kozlowski@linaro.org>, <robh+dt@kernel.org>,
	<krzysztof.kozlowski+dt@linaro.org>, <conor+dt@kernel.org>
Cc: <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
	<linux-stm32@st-md-mailman.stormreply.com>,
	<devicetree@vger.kernel.org>,
	Christophe Kerello <christophe.kerello@foss.st.com>
Subject: [PATCH 03/12] memory: stm32-fmc2-ebi: add a platform data structure
Date: Mon, 12 Feb 2024 18:48:13 +0100	[thread overview]
Message-ID: <20240212174822.77734-4-christophe.kerello@foss.st.com> (raw)
In-Reply-To: <20240212174822.77734-1-christophe.kerello@foss.st.com>

Before the introduction of MP25 support, let's use a platform data
structure for parameters that will differ.

The MP1 SOCs have only one signal to manage all the controllers (NWAIT).
The MP25 SOC has one RNB signal for the NAND controller and one NWAIT
signal for the memory controller.

Signed-off-by: Christophe Kerello <christophe.kerello@foss.st.com>
---
 drivers/memory/stm32-fmc2-ebi.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/drivers/memory/stm32-fmc2-ebi.c b/drivers/memory/stm32-fmc2-ebi.c
index 47d0ea5f1616..5f82686689ee 100644
--- a/drivers/memory/stm32-fmc2-ebi.c
+++ b/drivers/memory/stm32-fmc2-ebi.c
@@ -132,10 +132,15 @@ enum stm32_fmc2_ebi_cpsize {
 	FMC2_CPSIZE_1024 = 1024
 };
 
+struct stm32_fmc2_ebi_data {
+	bool rnb_for_nand;
+};
+
 struct stm32_fmc2_ebi {
 	struct device *dev;
 	struct clk *clk;
 	struct regmap *regmap;
+	const struct stm32_fmc2_ebi_data *data;
 	u8 bank_assigned;
 
 	u32 bcr[FMC2_MAX_EBI_CE];
@@ -988,6 +993,9 @@ static bool stm32_fmc2_ebi_nwait_used_by_ctrls(struct stm32_fmc2_ebi *ebi)
 	unsigned int cs;
 	u32 bcr;
 
+	if (ebi->data->rnb_for_nand)
+		return false;
+
 	for (cs = 0; cs < FMC2_MAX_EBI_CE; cs++) {
 		if (!(ebi->bank_assigned & BIT(cs)))
 			continue;
@@ -1108,6 +1116,10 @@ static int stm32_fmc2_ebi_probe(struct platform_device *pdev)
 
 	ebi->dev = dev;
 
+	ebi->data = of_device_get_match_data(dev);
+	if (!ebi->data)
+		return -EINVAL;
+
 	ebi->regmap = device_node_to_regmap(dev->of_node);
 	if (IS_ERR(ebi->regmap))
 		return PTR_ERR(ebi->regmap);
@@ -1187,8 +1199,15 @@ static int __maybe_unused stm32_fmc2_ebi_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(stm32_fmc2_ebi_pm_ops, stm32_fmc2_ebi_suspend,
 			 stm32_fmc2_ebi_resume);
 
+static const struct stm32_fmc2_ebi_data stm32_fmc2_ebi_mp1_data = {
+	.rnb_for_nand = false,
+};
+
 static const struct of_device_id stm32_fmc2_ebi_match[] = {
-	{.compatible = "st,stm32mp1-fmc2-ebi"},
+	{
+		.compatible = "st,stm32mp1-fmc2-ebi",
+		.data = &stm32_fmc2_ebi_mp1_data,
+	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, stm32_fmc2_ebi_match);
-- 
2.25.1


  parent reply	other threads:[~2024-02-12 17:50 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-12 17:48 [PATCH 00/12] Add MP25 FMC2 support Christophe Kerello
2024-02-12 17:48 ` [PATCH 01/12] dt-bindings: memory-controller: st,stm32: add MP25 support Christophe Kerello
2024-02-12 18:30   ` Conor Dooley
2024-02-13 10:56     ` Christophe Kerello
2024-02-12 17:48 ` [PATCH 02/12] dt-bindings: memory-controller: st,stm32: add 'power-domains' property Christophe Kerello
2024-02-12 18:33   ` Conor Dooley
2024-02-13 10:57     ` Christophe Kerello
2024-02-13 11:57       ` Krzysztof Kozlowski
2024-02-13 15:57         ` Christophe Kerello
2024-02-14 10:07           ` Krzysztof Kozlowski
2024-02-12 17:48 ` Christophe Kerello [this message]
2024-02-12 17:48 ` [PATCH 04/12] memory: stm32-fmc2-ebi: add MP25 support Christophe Kerello
2024-02-13  7:36   ` Krzysztof Kozlowski
2024-02-13 12:29     ` Christophe Kerello
2024-02-12 17:48 ` [PATCH 05/12] memory: stm32-fmc2-ebi: update the driver to support revision 2 Christophe Kerello
2024-02-13  7:46   ` Krzysztof Kozlowski
2024-02-13 12:36     ` Christophe Kerello
2024-02-12 17:48 ` [PATCH 06/12] memory: stm32-fmc2-ebi: add RIF support Christophe Kerello
2024-02-13  7:52   ` Krzysztof Kozlowski
2024-02-13 13:15     ` Christophe Kerello
2024-02-14 10:07       ` Krzysztof Kozlowski
2024-02-15  9:00         ` Christophe Kerello
2024-02-15 18:56           ` Krzysztof Kozlowski
2024-02-16  8:15             ` Christophe Kerello
2024-02-12 17:48 ` [PATCH 07/12] memory: stm32-fmc2-ebi: add runtime PM support Christophe Kerello
2024-02-13  7:59   ` Krzysztof Kozlowski
2024-02-13 13:31     ` Christophe Kerello
2024-02-13 13:33       ` Krzysztof Kozlowski
2024-02-12 17:48 ` [PATCH 08/12] dt-bindings: mtd: st,stm32: add MP25 support Christophe Kerello
2024-02-12 18:38   ` Conor Dooley
2024-02-13 10:57     ` Christophe Kerello
2024-02-12 17:48 ` [PATCH 09/12] mtd: rawnand: stm32_fmc2: use dma_get_slave_caps to get DMA max burst Christophe Kerello
2024-02-12 17:48 ` [PATCH 10/12] mtd: rawnand: stm32_fmc2: add a platform data structure Christophe Kerello
2024-02-12 17:48 ` [PATCH 11/12] mtd: rawnand: stm32_fmc2: add MP25 support Christophe Kerello
2024-02-12 17:48 ` [PATCH 12/12] mtd: rawnand: stm32_fmc2: update the driver to support revision 2 Christophe Kerello
2024-02-13  7:34 ` [PATCH 00/12] Add MP25 FMC2 support Krzysztof Kozlowski
2024-02-13 12:09   ` Christophe Kerello
2024-02-14 10:02     ` Krzysztof Kozlowski
2024-02-16 17:59 ` Christophe Kerello

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=20240212174822.77734-4-christophe.kerello@foss.st.com \
    --to=christophe.kerello@foss.st.com \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=krzysztof.kozlowski@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=linux-stm32@st-md-mailman.stormreply.com \
    --cc=miquel.raynal@bootlin.com \
    --cc=richard@nod.at \
    --cc=robh+dt@kernel.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®