From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752135AbcBWXxp (ORCPT ); Tue, 23 Feb 2016 18:53:45 -0500 Received: from mail-db3on0078.outbound.protection.outlook.com ([157.55.234.78]:16362 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750763AbcBWXxo (ORCPT ); Tue, 23 Feb 2016 18:53:44 -0500 X-Greylist: delayed 1084 seconds by postgrey-1.27 at vger.kernel.org; Tue, 23 Feb 2016 18:53:43 EST Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=nxp.com; From: Han Xu To: , , , , , , , , , CC: , Subject: [PATCH 4/5] mtd: nand: gpmi: support NAND on i.MX6UL Date: Tue, 23 Feb 2016 17:04:52 -0600 Message-ID: <1456268693-8630-5-git-send-email-han.xu@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456268693-8630-1-git-send-email-han.xu@nxp.com> References: <1456268693-8630-1-git-send-email-han.xu@nxp.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BY1PR20CA0015.namprd20.prod.outlook.com (2a01:111:e400:51a4::25) To AM2PR04MB0771.eurprd04.prod.outlook.com (2a01:111:e400:840b::23) X-Microsoft-Exchange-Diagnostics: 1;AM2PR04MB0771;2:UpIDJRsBegqbu5hpug6ueGKptWF8tdAqG1gv1smNHGLU4x4EVn3LmNaVLrpcEop0u+1uqgN56DGoae5nC7gCB5tfsJPlurBNPUYHwo44yh0tOThKshiqIi6FkFAwLey7U86b8glY1jav0SHQJhs68g==;3:bUzg+JDBWD91K7VE5H+zCBFFnCV0oRHO/I6MwPqXxNR92dy2EZYuKi3ioxc1Xyh1F5keR7xDBROQI3EwVuujtXjGXPLvlEpS/KU2OIPuByLdd8lcoY5Spmv3B4NWEml9;25:UrVXNphJYrWWIHRA2KPtrs2WOxzOeV/mzTE0+TxtmYuFkQ9ApVmT3WfcKIEAGlhMvnTDgvBNImSug5VENREYppEnZAfcBnV3Wrj4Ywj18dc1qfXgFCpYrWWUN9s6u8MpRIhWqPv5uAyDB0JXUHkiIWLggtc6ZwPXvlL85DmsLlPJrWqtQPjch0IGMnU/xb4OnqF/wKAxm9Q7XDlTfAvv4oS/m9EwVP7f35oNWZbHA7BeJJaTsBa6xUaFnlQW2N7ovqGPa4AzyYoGG+XlHUNNI1qZG5lkga3Wxyxt1vPH/Ni5EdcxluKbeU2lFa8KVxWop4xac//C8cCz3vQswPpZzTmXAfwsUsfK8TwUZNdNyWE= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM2PR04MB0771; X-MS-Office365-Filtering-Correlation-Id: 7c330277-8407-407d-a8ac-08d33ca7f7c1 X-Microsoft-Exchange-Diagnostics: 1;AM2PR04MB0771;20:5MA/lK/RvoWxKuD6JljdEuHJgyqrtR8VU93CgSnFlb9yvktgi3HEU265GG/nArJPPhDo8iTJ7521FyQ/moyadUy0T+HJrJ9lzUr0CYMuWTRj6wyDSNagod/H7/vy513kJF5EerYPdDDDxXGP7mtWC0LsKFKcpZ/kr82fkv+5mUCbH824dKhoTniF7ykcBN8F8ei+LCLW+jWvfTYTeLDS3YQj4KI99RYbFyc8NJHOJfmnxjBEXtpDdfnxR1GoezLy7L30SXQVlaxD1Hsdu99lIEcP8rtp94536AtEVMgMgnWLc63r15Z8GVBrKVWpMYHfuA/uoJKcaE22vuaDaVP7TbQdba7TKPtWofbJx0ZhLSRSOplFhBBHumPo4mt1YGQuIjfCURjmwDEYzeL8nTfp3ToE/pKeh9Y4x9UlGgiMtCIrHFCvnVrWBknFDpkU2uLso0sVvuK2yOR/3A6WeNykIrEZ86Gkwu/xY4fZ0XhNOgeqS6an/g+i0BOBLSho1YJL;4:ttjDuPZHdgm6XnryjQeBI+TbAvngokXGOAlIts1UhMYTJ6jAgSFqH7tcM0Xe266voMZuQLspRDzYLw4ClXdT00G0dC/m+zimK0g/wEMYYX81cnjUMoaCzTOKODcJ3Tc4ZrBjG9tMZ0cXM14xeDlf0lXNBK9OhylUW2DlyGnaW78nYU1iIJDZummktMl5/mewG5QeY2DtjItl9oDl/hfYP4RPn0/cWCXODTONjozS/AEKckOJU/O7FYsGkSCyOuO31BUwGKKepMdS0JBUQntnxM0PzENWglC7nROIs0MjeKu9Ab1rs6V8ous9noH8zby4PYBkoBVzBNom61lRTfEDriwyst7/j1g2kOHcwiYnm8nD7PzRqeiuhD/RrKZr0/x0QBLO5BuJvOtdZPOhhRme0XKljxyhLRnqGBNnpenWJOk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001);SRVR:AM2PR04MB0771;BCL:0;PCL:0;RULEID:;SRVR:AM2PR04MB0771; X-Forefront-PRVS: 08617F610C X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(42186005)(87976001)(3846002)(50986999)(189998001)(76176999)(5001960100002)(36756003)(66066001)(5008740100001)(47776003)(2906002)(1096002)(4326007)(2201001)(586003)(5004730100002)(48376002)(50466002)(6116002)(33646002)(92566002)(50226001)(229853001)(86362001)(2950100001)(122386002)(5003940100001)(19580395003)(19580405001)(5001770100001)(40100003)(7059030)(921003)(2101003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM2PR04MB0771;H:chopperman.am.freescale.net;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM2PR04MB0771;23:e65DVBmpkABj/gBAqvnCvGeoBu08lvNjAtCvjW53q?= =?us-ascii?Q?9ej8jYcMWQW9yyqH59w3PXjsbif+WjX87krlZlEb5G2c+W5Dwt5dkJSCcbPD?= =?us-ascii?Q?JRQCVoPPdr8V7j+QeofObFReIpnrBskSRK39Rr0D8/zGGUy9qVeqOvx59zRL?= =?us-ascii?Q?O87hQbU9P2z9+ZMaFFZiLskFv8+tRhUsVoXVtw7PV1VV8jeifaEb5XO5M3IF?= =?us-ascii?Q?EMzZYctw0w6R+Jj5vacH7uBTrWwdk6h7j7YkbN9dL0HkeZ2zysngX9Qi0Xlj?= =?us-ascii?Q?ip3bHG8pBcEKIyJ7HdDGvenHt/N7ihxpkCQWNDMAC0urqHQRXB/y1VABtPu8?= =?us-ascii?Q?HZjUC2zcB9YV+kYkpeEPJNBnceutIgBv8ad6RdLIfCDC9d2FEB3kz9mZ+Icr?= =?us-ascii?Q?8VLNxdl/Dw0x6M9x+Hmd4BbKL2qIIMYWuKeCPCbrS8zi0Exi58E0jj4kDxPZ?= =?us-ascii?Q?8jLD1x94rbxrYaHMl1fvVvBjGaAgKtajWg54hUNiU0eQIoNet2KTHN75Qwn9?= =?us-ascii?Q?eQ0f5mQBXeb69r0YLxIoXnqt1Rs2Wf1ZeqxTHPMlBwpjuTKEkz3+YBgD9XoJ?= =?us-ascii?Q?lHJw74tCJfMoxkLcmG9G9SseF61WdfhJj7Q3kCzS1rod1wJuCTfD+0TODiSH?= =?us-ascii?Q?4uLpgYcYjEH4tN9KXbxZ/nizQq1pWnGbIMkqGQ6m3+6uoEC4J0DRBGJNL7Zr?= =?us-ascii?Q?bUUsew6TnGXVDaUlW7ROPAVoVEzRGx86OaA1yQ43p2ovHSgEYL8LmaNWMef/?= =?us-ascii?Q?WxaL9GLusU7R/EV0KdRKf3hUZSBDnJtMaNuH3LCwpehUxbIoxuaCLo4zPUmt?= =?us-ascii?Q?o63HBGQ6ZOiOS+VI5L6t6kfPdTA+ovxqh3F5/e7VD8DFGY2cttWHRquQy3/g?= =?us-ascii?Q?ik8vtZvol0fvqXxplI8HHf+0A0XDKmNlPAoEZ1+Z+Ru1+9MRRZAs06iZ/xtq?= =?us-ascii?Q?2mSh4reMzPSKbks7CJi6sYXNxD1pQEaAXhWG2yjr3T+tieRJd7QXY2t3rLXc?= =?us-ascii?Q?g5UhT7P+LRkBSGkYIWZhXKDwzkplmB4BpE1g7g+3PAx9g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM2PR04MB0771;5:L5vzm/yF+ZJsR/9UycY7yJ2u0ueSZKwFXyMjzp7JP0v/lJWChGVDZYdDumHZmJXVg+mXHAgAAYgtEWiIyip8dyRzGKGuIIgHBIP8ggO5uzf/96t1IeYq4j2L2Dm81XU4OzwD7PGiZO/iG/kx5df2kg==;24:UD7Is3R/tfjLQ9b4vCt9A/RnItudb2R/w/xoA86MWbV9zNDph/jdW+Bv0DseEUj5oZGw+7bgUOyjVoI4fEfP7AfpaBxdt7+aTd6GDGNM8f8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2016 23:20:47.4178 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0771 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Han Xu support GPMI NAND on i.MX6UL Signed-off-by: Han Xu --- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 +++++++++ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 6b3ca3b..1987f03 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -89,6 +89,12 @@ static const struct gpmi_devdata gpmi_devdata_imx7d = { .max_chain_delay = 12, }; +static const struct gpmi_devdata gpmi_devdata_imx6ul = { + .type = IS_MX6UL, + .bch_max_ecc_strength = 40, + .max_chain_delay = 12, +}; + static irqreturn_t bch_irq(int irq, void *cookie) { struct gpmi_nand_data *this = cookie; @@ -2013,6 +2019,9 @@ static const struct of_device_id gpmi_nand_id_table[] = { .compatible = "fsl,imx6sx-gpmi-nand", .data = &gpmi_devdata_imx6sx, }, { + .compatible = "fsl,imx6ul-gpmi-nand", + .data = (void *)&gpmi_devdata_imx6ul, + }, { .compatible = "fsl,imx7d-gpmi-nand", .data = (void *)&gpmi_devdata_imx7d, }, { /* sentinel */ } diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h index 605d96e..eb45a3c 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h @@ -126,6 +126,7 @@ enum gpmi_type { IS_MX6QP, IS_MX6SX, IS_MX7D, + IS_MX6UL, }; struct gpmi_devdata { @@ -309,8 +310,9 @@ void gpmi_copy_bits(u8 *dst, size_t dst_bit_off, #define GPMI_IS_MX6QP(x) ((x)->devdata->type == IS_MX6QP) #define GPMI_IS_MX6SX(x) ((x)->devdata->type == IS_MX6SX) #define GPMI_IS_MX7D(x) ((x)->devdata->type == IS_MX7D) +#define GPMI_IS_MX6UL(x) ((x)->devdata->type == IS_MX6UL) #define GPMI_IS_MX6(x) (GPMI_IS_MX6Q(x) || GPMI_IS_MX6QP(x)\ - || GPMI_IS_MX6SX(x)) + || GPMI_IS_MX6SX(x) || GPMI_IS_MX6UL(x)) #define GPMI_IS_MX7(x) (GPMI_IS_MX7D(x)) #endif -- 1.9.1