Received-SPF: pass (google.com: domain of linux-kernel+bounces-183952-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Frank Li <Frank.Li@nxp.com>
Date: Mon, 20 May 2024 12:09:15 -0400
Subject: [PATCH v2 4/6] mtd: rawnand: gpmi: add iMX8QXP support.
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240520-gpmi_nand-v2-4-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?WlJGNlM0amdYSEdGOWpKdHRnVHVhNkl6UUsvb0VKWFhuUWVtVXU1ZzNlOEFT?=
 =?utf-8?B?Zm9TSExvVW5Zc3g3a1FLWnlnYTZjOERaL2FMSGhzWHZnTi9rb1BPdytyTDAy?=
 =?utf-8?B?Vk9xNk1DTml3bWZPRmRkWmlaNksrK1JJSjU0cVFObXdCeUphUlZDL2I5dVYy?=
 =?utf-8?B?Wi9kN3VrTjV4YVBKZDkyaGt1Tmc0YjBlR2VUajM5aWVXL214NW40a0UwWjJu?=
 =?utf-8?B?bzE0SFJlZVhHZXlROXlqYnUvcWJ5UXBXWE1TZVRHdDRCNGZXK05sSU9BM1Ax?=
 =?utf-8?B?WElFd2d4RHEvbjNyc1VhZkVlYkxMWUpSaEkzaS9ZeGpZaWhabUFXeHFlejV5?=
 =?utf-8?B?N0oxbTRuSkJmOGQ1dWF2UkVPMm5HOFJJeW5YRFlDMUd4QkhtUEZmQ1lPVmw3?=
 =?utf-8?B?MWdQZE1NallkTGp3V1UxQ1M4NTZLU2xmOUFiZnlKZlBONytxWDg0eDB4VDVz?=
 =?utf-8?B?UlU3cGlxWE14clkzQkszYXhiT0J3aHhqbmoyc3lCK1UxRHc5MTYxaDVhZE4r?=
 =?utf-8?B?ZVB3K2o2aHFkeGJWMTNHWHAremYvWkswUlV5K0w1VnJabnNCZlFYK3l4bzJG?=
 =?utf-8?B?VmVrbGNuaGtjbTArQnFNZ1JkcEZmT2JMbTRWV2NubVQ0Rkd3ZmZOM2RGeFha?=
 =?utf-8?B?WEs3VjVKUmpiT0wzV1ovbVdRZVUzK2t3TkNjTXNST3h5SkFSM25RUUE4WDg0?=
 =?utf-8?B?WXhVTVRLcDMrbHBla2FVUXhrT29xYzcrNjJSQmNSb0VhNWJFTGZRNGI3WGZ3?=
 =?utf-8?B?U1BKYm1ZTjVNVlpmT3d1bnBxcVZVK1YzNjV5MFlpekZ0d3J2Wlp3QytKUm51?=
 =?utf-8?B?SklMMTdSZ0R5NFRXYTVNWU9Fbm9ZSHFObXdab2JzZElZYjA1UVc2c2prVUdE?=
 =?utf-8?B?TXRna2ZHNmZyUEM2Szd4R09iV2lyUjhXY21tZXgwbXhkd0hROHg5WmRHbHBK?=
 =?utf-8?B?RUkwN2tUSy9HNEpuSDNiekhadUZnVys5M2NnaVRySEFiRnFOMTJtbmJFWVJN?=
 =?utf-8?B?ZGJrSGhrTithYTZCdmo2ZTJLMjB5SjI2RFdPc1JiZEdveG9ad2pHQ3JyYWFv?=
 =?utf-8?B?WDdWVDRmRGl6MmdwUWlIL0NHNkgwRHdzeGQ4dDZRMUVPL3I3ajd6bzJCNzB5?=
 =?utf-8?B?YlAzYjlGcnlYbGc3UXJubWtCL2dNcHkyU0hJNlJkQndpd1ppNVJQYWJJTWdl?=
 =?utf-8?B?bEYxTHc2OTJvQVd5dmY5VFM4UjRBUU05SlB4RmhEOWthdkdCWVJmQTlvQnFP?=
 =?utf-8?B?cE1SclBwclBObS9pQ1h4akhNd1N6aVNHZi9COURpd3NHWTROOERVaGFuNHFr?=
 =?utf-8?B?ZUxkQkFQcEhzTGhsM3h2TENkNUc3L3czSVRLN0NCeGZEQzdsWmVsSnZSM2RZ?=
 =?utf-8?B?QzJ4THF1MlVhTUFrNktOODNzY01Ga01LWmtZMy8yRk1vVDZzRk9JQnBuRVpN?=
 =?utf-8?B?RFN2VTBVbzZqZ1d5aTh5dzJ1eUE1MVZGUThvNlZNdmYzd1VWd2JTNUE3dTBB?=
 =?utf-8?B?QnN0V21kaUloU09UdUxQdVhld1N1MjM0N0Z0K3lKNVBnV2p6VDZELzBhcWxB?=
 =?utf-8?B?YmR4cnRZeGxmc3R6SXJFUDdCZnFpczRIWTVXTXFTQWpFTURISnhyempOMXpk?=
 =?utf-8?B?MGx6SEZna29wVUp1dGNCeG1ZdG9VanhkdlRBNGI2OVQ1RjFnWklYQjZLRUlz?=
 =?utf-8?B?OCtuVUY1QVFpeG82RTJEU2lhYUUwclFkVmdJVHQvQk5JbmxreFBGeHVGUDN3?=
 =?utf-8?B?YWVQWU1jOVl6NXdnYytFSVF1SkZ1bEZFTG0xTVhlaVg3T0YzUzkxL094U25Z?=
 =?utf-8?B?SUVuaE5ReEZ1dE1UYVExNjBKVTIvSmxGUGZqSTRaNkJIeGwwSkJUR1grN3lO?=
 =?utf-8?B?NnJBOHdSc0x1ZlJOcUI5Q1h1TUZuMjMrbUZoZDBmNThoZW1oV1dyQ1RVYmk5?=
 =?utf-8?B?OFNLYUNvV1ZjcUY4REVPWXhITXpYWUY4bXFJWkNrbitRQnkzKy9FSHhsY0NQ?=
 =?utf-8?B?MGJOaloxS0tkbWh5V040bnJzb0ZIVU83RjFGMUozdUFCY2V6ZnlSOWFOanY5?=
 =?utf-8?B?RkpRNWVrNnVmQ2w5cDdCV2RLcVdtdFJyamhFWEpOMlVXOWdqbDFyeVhNajhW?=
 =?utf-8?Q?FtRs=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3e608ea4-862b-49c4-b30b-08dc78e754de
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:13.7130
 (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: iANiWmnoLOMMdmQ5q+wMjH83guSkxsnuayP8Q3HiJzm0ADGMxrvHNkoi5FhHt1FMPsr61TzhVU4yHWxPM03xdA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB10164

From: Han Xu <han.xu@nxp.com>

Add "fsl,imx8qxp-gpmi-nand" compatible string. iMX8QXP gpmi nand is similar
to iMX7D. But it is using 4 clocks: "gpmi_io", "gpmi_apb", "gpmi_bch" and
"gpmi_bch_apb".

Signed-off-by: Han Xu <han.xu@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 14 ++++++++++++++
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h |  5 ++++-
 2 files changed, 18 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 fbb1f243ef129..e1b515304e3cd 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -1182,6 +1182,19 @@ static const struct gpmi_devdata gpmi_devdata_imx7d = {
 	.clks_count = ARRAY_SIZE(gpmi_clks_for_mx7d),
 };
 
+static const char *gpmi_clks_for_mx8qxp[GPMI_CLK_MAX] = {
+	"gpmi_io", "gpmi_apb", "gpmi_bch", "gpmi_bch_apb",
+};
+
+static const struct gpmi_devdata gpmi_devdata_imx8qxp = {
+	.type = IS_MX8QXP,
+	.bch_max_ecc_strength = 62,
+	.max_chain_delay = 12000,
+	.support_edo_timing = true,
+	.clks = gpmi_clks_for_mx8qxp,
+	.clks_count = ARRAY_SIZE(gpmi_clks_for_mx8qxp),
+};
+
 static int acquire_register_block(struct gpmi_nand_data *this,
 				  const char *res_name)
 {
@@ -2725,6 +2738,7 @@ static const struct of_device_id gpmi_nand_id_table[] = {
 	{ .compatible = "fsl,imx6q-gpmi-nand", .data = &gpmi_devdata_imx6q, },
 	{ .compatible = "fsl,imx6sx-gpmi-nand", .data = &gpmi_devdata_imx6sx, },
 	{ .compatible = "fsl,imx7d-gpmi-nand", .data = &gpmi_devdata_imx7d,},
+	{ .compatible = "fsl,imx8qxp-gpmi-nand", .data = &gpmi_devdata_imx8qxp, },
 	{}
 };
 MODULE_DEVICE_TABLE(of, gpmi_nand_id_table);
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
index c8a662a497b60..3e9bc985e44a3 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
@@ -78,6 +78,7 @@ enum gpmi_type {
 	IS_MX6Q,
 	IS_MX6SX,
 	IS_MX7D,
+	IS_MX8QXP,
 };
 
 struct gpmi_devdata {
@@ -173,8 +174,10 @@ struct gpmi_nand_data {
 #define GPMI_IS_MX6Q(x)		((x)->devdata->type == IS_MX6Q)
 #define GPMI_IS_MX6SX(x)	((x)->devdata->type == IS_MX6SX)
 #define GPMI_IS_MX7D(x)		((x)->devdata->type == IS_MX7D)
+#define GPMI_IS_MX8QXP(x)	((x)->devdata->type == IS_MX8QXP)
 
 #define GPMI_IS_MX6(x)		(GPMI_IS_MX6Q(x) || GPMI_IS_MX6SX(x) || \
-				 GPMI_IS_MX7D(x))
+				 GPMI_IS_MX7D(x) || GPMI_IS_MX8QXP(x))
+
 #define GPMI_IS_MXS(x)		(GPMI_IS_MX23(x) || GPMI_IS_MX28(x))
 #endif

-- 
2.34.1