Received-SPF: pass (google.com: domain of linux-kernel+bounces-183951-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Frank Li <Frank.Li@nxp.com>
Date: Mon, 20 May 2024 12:09:14 -0400
Subject: [PATCH v2 3/6] mtd: rawnand: gpmi: add 'support_edo_timing' in
 gpmi_devdata
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240520-gpmi_nand-v2-3-e3017e4c9da5@nxp.com>
References: <20240520-gpmi_nand-v2-0-e3017e4c9da5@nxp.com>
In-Reply-To: <20240520-gpmi_nand-v2-0-e3017e4c9da5@nxp.com>
To: Miquel Raynal <miquel.raynal@bootlin.com>, 
 Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, 
 Rob Herring <robh@kernel.org>, Krzysztof Kozlowski <krzk+dt@kernel.org>, 
 Conor Dooley <conor+dt@kernel.org>, Han Xu <han.xu@nxp.com>, 
 Vinod Koul <vkoul@kernel.org>, Shawn Guo <shawnguo@kernel.org>, 
 Sascha Hauer <s.hauer@pengutronix.de>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Fabio Estevam <festevam@gmail.com>, Marek Vasut <marex@denx.de>
Cc: linux-mtd@lists.infradead.org, devicetree@vger.kernel.org, 
 linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, 
 imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, 
 Frank Li <Frank.Li@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?TnEzMzhleDJuSnl0cGdHRHVkSnpUclBnOHZuaXg3ekZubkcyeksrOFMyODVJ?=
 =?utf-8?B?SWMrcFhNTWNjazBVQXBDaHJ2Nm5tZVBQMi9Cbzh3b092Q0I3WmNTeUpGN0hk?=
 =?utf-8?B?T0RxOUZOREJGL1RWeDNiVDEzYVpLQldqcHhSYXVCMWIrUkdRVlRRbVFRTzB1?=
 =?utf-8?B?cWpDOFo3R2pxWTZORkNUYnZhaWlaZUJsQ0c3SHVCNjI2VGY2SGI5Zk5xWHM4?=
 =?utf-8?B?TXpZdVZpSS9Ddytsd3UyTWRMQ1Z3ckVTc2FveFlEbCtNRmhmQlpOcS9yN3Zh?=
 =?utf-8?B?dUtBdU8wRU9ObzAxZVFkNThsWlJlUW5GanZzZ3J5ZXZTV3FBWE4rbEFacklN?=
 =?utf-8?B?NnUxOUd2dS82NGx5a0JnaWcrUmU0cHdRYXU2cUlFNWdOdlZpY3UxNm16OTZt?=
 =?utf-8?B?UFY1aVgyblJwQk4wRVhCWVdHTjdoelFwT3duWU1VeUN3MGg0WCs3OHJTYVJB?=
 =?utf-8?B?OFZhRDlzT2RFR05LYjQ1SGJRVXRJa2Z3REFaTDRHeUl0U3N1ZUFVK2dZSWY5?=
 =?utf-8?B?NGlpcGdUVjJoYzhwbnM5R296T0FucmpiUk93TmtIUG9Oc0dEOUFUMHlBY2FC?=
 =?utf-8?B?dVdtbzJyNGJrT0FhdlQ0ZHd4ZWdDTkdVakc3YWcvNWtEZ0pSYUttOWhDczRR?=
 =?utf-8?B?MEdHNzQ5UHY3VVBXVHFqRDF6MkVQd1k1emd5VjVwWjcvY0NQaU5qS0R1Wk4z?=
 =?utf-8?B?TzI2T3RGaStsL09ONXRIOFBQa00vSGkvRFc3VllEZmswSWVlNFFhUWNnTjVv?=
 =?utf-8?B?UW1rQnVMNmsxUWRzdDRRNmc5cTl0OGhmeGJFNkF4dk1PQTc0SVRoUkJOOUY0?=
 =?utf-8?B?U3c2cmpzUHIzRXZ4RW9yTVd4dUE2Y1BMcENQZ1BEbWdjamxlTzhqRFF2OXhz?=
 =?utf-8?B?RGdpT2lvR05SR1MwVVFmN3ZrelVmc2Zua3YxRzJBN1dZR1JDWk01cmNTcEp1?=
 =?utf-8?B?UFhUR1FNUWNzYWhwYTFZTGtXc21ZTFYrbWR0TVlpUVVtZHlBT0tFd2M4OUxJ?=
 =?utf-8?B?RDlqSXoxS0wxZHgweVhWYkRPVG5uSGprZ3hJTFlQeGZIM1dtL2FVTkE0UDRj?=
 =?utf-8?B?YVdOOFgwNzU5L0V4WFhaUkJnTE15ZDV5TnAyNGNYZXFrNGxaTGZlZEFVbE5x?=
 =?utf-8?B?ZDlWL1VuWWRFSU5NMzlCQUk5MHFzTmIyWUs3VUg2aUV0Q002ck9QU0lCQXU2?=
 =?utf-8?B?cWsrdEUyYUFkcCszUzlheDVvODN2blZjR3B6VElCdWs2UXVMcjE1bERoSkhx?=
 =?utf-8?B?U0ZjOEI2dFBqL09RZm83SXZUYUI3cWFKcjVDSzc5VmhScWdxNjZWcjBSdWo4?=
 =?utf-8?B?aHZTOUhwREI1V0hKY1dNSm1ZV0ZQbStjS29oY09qQk42aVhmd095T0NjNm55?=
 =?utf-8?B?TXdGQWVvZWZ3UUdEaEZrSXJJS3JNUUlPdVZTSGcyNmpQa005bllQNkFvZ0kz?=
 =?utf-8?B?a0Q4cE5IL1plQWpYZVI0TWtmTlBDRU1GR3liRmlJbnpHbzk5cDVQWGNHZ2h4?=
 =?utf-8?B?Y01BbXk5SmNKaFQxKytiV1hURHlhU1BJbDNTWEIydWZBM2FiZ3ROSGtYdmd6?=
 =?utf-8?B?VUc5VHEyQVhLYXRvTS9aWFVPVjg1TklPdnFNdUN0aFlPMlMyU2kzaGNrMFIz?=
 =?utf-8?B?S1VUZXNRK0MxZk84eVBHdms3STZuajRuYzNJVGE4MVp2ZUU0S1RxeHlJZFlr?=
 =?utf-8?B?MXhQM2JSR2RDS2dJT0RZLy9HRUFCSHJGK3NNRTA0YVFOQ1RLYlI2L2Y3MnFV?=
 =?utf-8?B?bm5kZEVCTXB1RThOTUVTZmt5bXQvcHJEdVIrNi9wWlBRTkRwU3N4ZUtZMHN4?=
 =?utf-8?B?MWZWekxSMnV6WC9laXJDUlBBQVZTaDc5VkpBNzh6Y0VCb0Ezc3ZsS0IzRTNh?=
 =?utf-8?B?YlhhUFhVS3phTW5TdjJqZG14eEJCV1I2QU9jUkVzVTF2L1pzekJMbjBBRCs5?=
 =?utf-8?B?Q1ZTajJDajgwanFMT0ZQZ2xaS0QrcndoOWV0cVBaRm54V0N4Szh4dDlNZVFl?=
 =?utf-8?B?dzREZ3c4RTNWUGh4Q2JQcTAwbkMycUhUTWdadlZyb2x5QUJCekFjbENpSkxs?=
 =?utf-8?B?bytSTXNkRkhwazk2SjZTTU8yVURnclBxTU5BcmNHbEUwRVRyMjkwZjFhTkZ2?=
 =?utf-8?Q?vZMo=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ba2a5af9-2db6-42a9-6a38-08dc78e7521a
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 16:10:09.1093
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: OtpD7E8dHTEyXzZ81J5T27QPFyf/dJhqpXSaxp+2hjN60zd/2tcKMwOXnFbKmxvyciFPhPRak9y50X5A5ZPd9A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8535

Introduce a boolean flag, 'support_edo_timing', within gpmi_devdata to
simplify the logic check in gpmi_setup_interface(). This is made in
preparation for adding support for imx8qxp gpmi.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 6 +++++-
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index e71ad2fcec232..fbb1f243ef129 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -983,7 +983,7 @@ static int gpmi_setup_interface(struct nand_chip *chip, int chipnr,
 		return PTR_ERR(sdr);
 
 	/* Only MX28/MX6 GPMI controller can reach EDO timings */
-	if (sdr->tRC_min <= 25000 && !GPMI_IS_MX28(this) && !GPMI_IS_MX6(this))
+	if (sdr->tRC_min <= 25000 && !this->devdata->support_edo_timing)
 		return -ENOTSUPP;
 
 	/* Stop here if this call was just a check */
@@ -1142,6 +1142,7 @@ static const struct gpmi_devdata gpmi_devdata_imx28 = {
 	.type = IS_MX28,
 	.bch_max_ecc_strength = 20,
 	.max_chain_delay = 16000,
+	.support_edo_timing = true,
 	.clks = gpmi_clks_for_mx2x,
 	.clks_count = ARRAY_SIZE(gpmi_clks_for_mx2x),
 };
@@ -1154,6 +1155,7 @@ static const struct gpmi_devdata gpmi_devdata_imx6q = {
 	.type = IS_MX6Q,
 	.bch_max_ecc_strength = 40,
 	.max_chain_delay = 12000,
+	.support_edo_timing = true,
 	.clks = gpmi_clks_for_mx6,
 	.clks_count = ARRAY_SIZE(gpmi_clks_for_mx6),
 };
@@ -1162,6 +1164,7 @@ static const struct gpmi_devdata gpmi_devdata_imx6sx = {
 	.type = IS_MX6SX,
 	.bch_max_ecc_strength = 62,
 	.max_chain_delay = 12000,
+	.support_edo_timing = true,
 	.clks = gpmi_clks_for_mx6,
 	.clks_count = ARRAY_SIZE(gpmi_clks_for_mx6),
 };
@@ -1174,6 +1177,7 @@ static const struct gpmi_devdata gpmi_devdata_imx7d = {
 	.type = IS_MX7D,
 	.bch_max_ecc_strength = 62,
 	.max_chain_delay = 12000,
+	.support_edo_timing = true,
 	.clks = gpmi_clks_for_mx7d,
 	.clks_count = ARRAY_SIZE(gpmi_clks_for_mx7d),
 };
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
index c3ff56ac62a7e..c8a662a497b60 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
@@ -86,6 +86,7 @@ struct gpmi_devdata {
 	int max_chain_delay; /* See the SDR EDO mode */
 	const char * const *clks;
 	const int clks_count;
+	bool support_edo_timing;
 };
 
 /**

-- 
2.34.1