Received-SPF: pass (google.com: domain of linux-kernel+bounces-182505-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Frank Li <Frank.Li@nxp.com>
Date: Fri, 17 May 2024 14:09:50 -0400
Subject: [PATCH 3/5] mtd: rawnand: gpmi: add iMX8QXP support.
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240517-gpmi_nand-v1-3-73bb8d2cd441@nxp.com>
References: <20240517-gpmi_nand-v1-0-73bb8d2cd441@nxp.com>
In-Reply-To: <20240517-gpmi_nand-v1-0-73bb8d2cd441@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?Z1l1RUdTaU9QcWgrRUhsUS85c0VCV2JSQUZ2SUJXbUhLWUNrdWo1MzRDMU5k?=
 =?utf-8?B?aWJLM0NlKzhua2ZwTVFwclJqaklzMjRnUHY0aW1oMllxekIzQlJFVUlvUTht?=
 =?utf-8?B?ZkJrQ3luTW95dDdmdkZwTkpYVEcvNWtIN0syYkhUNmNXQXdlSXNFN05WNXlO?=
 =?utf-8?B?SEo1T0RWWm5CNEo1WGgwYlNuVUJteGtBTC9MZGQyTHh6VEkxckh4STNac1Rz?=
 =?utf-8?B?a1RtVGt4UmpXbWZoK1V0MEtEM0xRMzhERmJFQVpZTEZIYnFSSFg1RlFGSUVi?=
 =?utf-8?B?dUFVNGNhSXB2cDl0SVNqMk5CWWhzNm5wUGpxbEtlRzRXR2Nld3RnamNPODFK?=
 =?utf-8?B?dWdnSmd4SnBqa0JnZkt3TCt2VjI0TzNzRjJxOXRtUFZ2VFA5cEFVWnpkaFFR?=
 =?utf-8?B?WGtoQmwvWlVEZ0czRUhma1M1YnNWazlDeEtCNktoYWdKdW5WbFlIR1dpOHZL?=
 =?utf-8?B?OWVNWEcwVDFxeEJpZWtnNHRCZ3FPWnRKYTRuNnppS2dRbkNOOW1lTlN2NkxC?=
 =?utf-8?B?Q0s5ZU9laWZ3WTltUWFGSDhzM1FMRE1MNHVFaXllcW9TRm8yUGp2cjB2MkhZ?=
 =?utf-8?B?cFhBeWpmeFZCWEVlMVBIQ1k4cURIM2loak1nZVRlRWk0YldvZG5hdG1zTm1t?=
 =?utf-8?B?bHRUSjBEUlo1UGVMYlhKcXhqdHZ2UXhKYnhNY0ZLdzhrcDAyYTR4UlYwY0F0?=
 =?utf-8?B?bzhFYmUwd0c2R2lnSHF4K0FvdExnaXFqejJOc3dyTGpiMHhSSEg4bFlKNDd1?=
 =?utf-8?B?UzltR2prOHVKbzBzcVB0eEdYQWFVWTdLZ2xHcGlLRHhGYnhZbUtodTJPY2JF?=
 =?utf-8?B?U250aHl5cHJKVkNqQmlxQU0vYmtQbGNqK3F5RGRGRXJablZYMDcyY25TWXFZ?=
 =?utf-8?B?NUVyQVQ2YWZZb3dHQlN0N2J6RTFncER6bzgxaERNdTQyL1FXWjFicjNOamV5?=
 =?utf-8?B?UE42cWNkTk1rWTJDRWI1dithV05VdVoxZnV4bmlvVzVHMXlnT2N4SFE1aitY?=
 =?utf-8?B?dmJvdE5VZW5MN00wODhoM0drRGdwdFZQSG8zbGI1b3FKZW1MNWhFZ3JwSEVa?=
 =?utf-8?B?clJyTnBTQnV1YW13dnhyWVlWR0Q3UTJzdHI1RS8zVDBYNmc4RzB5SGpGRnhw?=
 =?utf-8?B?ZGJUNGtMK1ZCalpOSE5mTVZFMXhwTHprNkorSU5HZFl3ZjJPSDVZbE51UlZH?=
 =?utf-8?B?Vk5xT0lEWll0N2d3YzFiUm0zRGl1dmhxSkJ2SmZOclVuY28yL2JXTE4zMmd6?=
 =?utf-8?B?cGp1aDRLbGN6UlNNaW5zS096VS9LVjViK1RkOExHeURybXU2Yld2aXBpVXdV?=
 =?utf-8?B?S3k2ZVNJcjdwQTZScWtyQjJBbitjR1dFNVlYS0I3OXI2MnN2OFdNK0ZMREZv?=
 =?utf-8?B?QnN2dTJEVFR4QVVGYmpsTHh0eGVxeHJ0d3Y3YkVuMnNwNmg2WStUMW5SN29R?=
 =?utf-8?B?Q0R6QVpDOVMzVHJjRjhQRU8zVWJ3Y2xzQjlIOFNwblZhRlMzL2VycDBubTMw?=
 =?utf-8?B?bEJxVTBDV2pyL2FOR1QxYXdaZytVM3hHd3lMbGt0dEZWVUdIeHl0dm4xS3F4?=
 =?utf-8?B?L2piRDFPUmVGQ1d3UmVXeGRxazhneUJHWjQrVmRoVjVyS05tbnkxUXJjVkt2?=
 =?utf-8?B?Y1dJU3NBbmJ5dXJ3aXo5SUFUMFRTa1hKb20vNGRhL21CYlZKK3FYZUozN29F?=
 =?utf-8?B?V0l1bTAzZU9vVW9GV3U2QytQL2JvU1RuaUtkcWtPK3lmckpFcnJmV2NOYzEy?=
 =?utf-8?B?UkFGYTg3VGd1azcxTDZOUG01OHM0Vk80NDZJRndGRERkOWd6QzhMSktNNmdq?=
 =?utf-8?B?KzFYK3FaNG1yK2tTRFd3YUJuYzh2VFNyUTk4a1F5MHNjdjU3UlEzMk5tczJP?=
 =?utf-8?B?aG13czZRbkRMYzhzbjBnbm9CSE4yU0g5dys2dG41Rms3bWFrTHorb3JodTh3?=
 =?utf-8?B?TUdOT3lUZjZJdlZycThQOWt5eTMyd3ZRaWdRVE94L3V6ajRlZ0ZhTHNsK1pr?=
 =?utf-8?B?MzQ5N0c4Z2o3dU01MWFuTUxVc0JEUWt4a1o2Uy9ZSFJoNGhpank5ekNFTmJY?=
 =?utf-8?B?UExYQm9iQXdRdmtjNVZWdzlwaHZIVDlhVml4a3FtUXEvWnhzUXFzdU53cVJ4?=
 =?utf-8?Q?tntltz44QdLNKn6Et7dm1Z4ok?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c57aea81-fcfe-4282-aa6d-08dc769ca5f7
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 18:10:35.2184
 (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: j+hpbiHWBVMw9wdJu5cFAEZvPIu2f4mxBGQy0LJodcyLAUPlrGMnbcNBW7OUycUHHg8NBvtXWp56HXfiwCrVdg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8955

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

Add "fsl,imx8qxp-gpmi-nand" compatible string. iMX8QXP gpmi nand is similar
with iMX7D. But it using 4 clock: "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 | 20 +++++++++++++++++---
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h |  4 ++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index e71ad2fcec232..f90c5207bacb6 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -983,7 +983,8 @@ 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 && !GPMI_IS_MX28(this) &&
+	    !(GPMI_IS_MX6(this) || GPMI_IS_MX8(this)))
 		return -ENOTSUPP;
 
 	/* Stop here if this call was just a check */
@@ -1178,6 +1179,18 @@ 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,
+	.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)
 {
@@ -2281,7 +2294,7 @@ static int gpmi_init_last(struct gpmi_nand_data *this)
 	 *  (1) the chip is imx6, and
 	 *  (2) the size of the ECC parity is byte aligned.
 	 */
-	if (GPMI_IS_MX6(this) &&
+	if ((GPMI_IS_MX6(this) || GPMI_IS_MX8(this))  &&
 		((bch_geo->gf_len * bch_geo->ecc_strength) % 8) == 0) {
 		ecc->read_subpage = gpmi_ecc_read_subpage;
 		chip->options |= NAND_SUBPAGE_READ;
@@ -2692,7 +2705,7 @@ static int gpmi_nand_init(struct gpmi_nand_data *this)
 	this->base.ops = &gpmi_nand_controller_ops;
 	chip->controller = &this->base;
 
-	ret = nand_scan(chip, GPMI_IS_MX6(this) ? 2 : 1);
+	ret = nand_scan(chip, (GPMI_IS_MX6(this) || GPMI_IS_MX8(this)) ? 2 : 1);
 	if (ret)
 		goto err_out;
 
@@ -2721,6 +2734,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 c3ff56ac62a7e..502f01a8338c3 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 {
@@ -172,8 +173,11 @@ 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))
+
+#define GPMI_IS_MX8(x)		(GPMI_IS_MX8QXP(x))
 #define GPMI_IS_MXS(x)		(GPMI_IS_MX23(x) || GPMI_IS_MX28(x))
 #endif

-- 
2.34.1