From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759224AbbLBXBu (ORCPT ); Wed, 2 Dec 2015 18:01:50 -0500 Received: from mail-bn1on0135.outbound.protection.outlook.com ([157.56.110.135]:2784 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759053AbbLBXAZ (ORCPT ); Wed, 2 Dec 2015 18:00:25 -0500 Authentication-Results: spf=permerror (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=freescale.com; From: Han Xu To: CC: , , , , , , , , , , Subject: [PATCH v8 5/7] mtd: nand: gpmi: add GPMI NAND support for i.MX7D Date: Wed, 2 Dec 2015 16:47:44 -0600 Message-ID: <1449096466-18064-6-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449096466-18064-1-git-send-email-b45815@freescale.com> References: <1449096466-18064-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11OLC011;1:pkCcATQcxby1a2wharldshW/8VgiU0q449d/RV5sl1uFZ0sp3BjDwbKqpCBXUYblOsjO0uaDMjhr0XbMwkUR3wzMWzybWzLFLk1SD4C14uP3r4TLVijhEVzRUgwhUV8v5E1zZjbuhSdBjXkl0VsXwQrMqYqAWwywz1SQI+ZU1U5bT7oGW6HPJ9mxp6YeA3YqQxW0j7Ai+NiByVJJOmtXlJFnmTU8/ZsGGJD1nfRxjRDzhIP65yQKuGAwsGgga6SaA7PVaO9PspO228Wf0kqB4ev12RfL3nuqvsro5kNnq1fFF2cMsMtYM+h/sQwBgjbaPki7wmBzFDqFbjHRfVW7KZkbuQvrKcr9nGalOceJLYwpYD21egtQ0ggiToC9b8excnyG2mTbcNuXuxs8uUJ+8f3bHRxoPCWIBszro8rI40EFtGRkvjyNt7Bg54NURIJM X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(448002)(189002)(199003)(1220700001)(36756003)(11100500001)(1096002)(97736004)(81156007)(189998001)(104016004)(575784001)(50466002)(586003)(5003940100001)(50986999)(76176999)(87936001)(77096005)(48376002)(2950100001)(33646002)(6806005)(5001960100002)(110136002)(50226001)(19580405001)(229853001)(5008740100001)(92566002)(47776003)(2351001)(85326001)(106466001)(19580395003)(2004002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:BLUPR03MB1428;H:tx30smr01.am.freescale.net;FPR:;SPF:PermError;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1428;2:Wfm+sKU9mPaVrEamll0IfIkVfG/bAHrElymDap+w/2KDvSl1GxsXmEWfJRPyBlbtGGRtdtxl/o5pLUQYvq5YAzCzsJn44cQCVNRxEdVGrAYvM4KCLs2IxEaIsfC15QD2nTU8JDtF9L1nOeWnOiIc7w==;3:ZYAQ/ewoA9ABr0UB8D2RX7RgoQUM2DdEfZ+pyxeo4VAUEQVYLGFpwR0A8yVOkxlixAkk4kp+rPltujnXpHKeKw/GlIdDnafTPl/YtjoUIL1z734xyzOIfMWhzUxYp0XcR232x50iwiP2AzKdQBS1vr3uyU9MJ7zFvymPqmAOJ8hu+ZMOt9ffcJ1F6AdwvqTzxExJUHr+lVbV9ilVx4iEwpucOE4vwIX6P2yZAEeesyU=;25:FjcPUt68/AgwG+aBAAWOKTX6Ut0CUGJ7aV7C7TEcoBcsHTK6paTEanwjW7HpIJBu4+Bj7nr8oixK6h+J9WsRfSV+qHg8xk5EPjMkIha/3bW3KqBJ2Hi5a+r1stkzrq679dhmkDVD3X0TOHmdAWd48CHAd0hCIsWXiicyiWRedco74ZbWjJOYsgMDieT8IEdYiu30EG3yrcJzg9n6mSKaF7eObeRMj0ukHFfB87iIGSjiyb8whDM7Gzbyn3iYUO3K X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1428; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1428;20:xWq0W8UdmMzfHJAx2wKjhQIfFU7BGt7LP8wULxpEPOuUGZj+FNA3OPMqdVoV8yQnpio7ppmgahI7TqEqMin/zDsRsVWv4eqgbkeRXS2nG2pxql7ngXMgM9zLs9mfnJd3DswwZIEIAypEhOce1h8Jfwm6PAdTClA0pdbvXRBUNlLjGffcRbqjRZJZw3x4vI9RTCBcV6zONpjEMOmCdr+hZAKfmY9dhy606e/wUcKCrcKnxuVe0H07/FbcA9L1CXzAEPUGjiq67ra5AZanEjpwisEcQB3AwVNm7S7IWznWwo2Z6OLEzCGZnwrMUf/VJJLlFiM6vRtfP5Clja8EiZ1xQPXShfgGY2wgPh9Vt0LVq0w=;4:iozFSsbTh8ibJs1kJKjNNbSve+eLsSx0fhSo3cwzY5o1K6NcHayDkz8Ev0n86oo0dAm8l08VfpWJo75yq5Tn18d61dkVm1NHQ9C0rdPg9r2Okd0kcEqTs1oCfX+kSZACcOfELaqyqrYav0ScMxc8e/M8pLKIUrmhUpO8Utu75c5+2qSqFHncYNW9SPhZ7fVX3aYhrkIPv6f9ZJ06Ck6aPexZdOA38OQNOBRPRDUuEiQNMq0Hbz6uaEPcFM3yQSATLOqDg1+J2MMlddkpZMjSPQLRyG0v3LufdRRPS0jUJTra5V0Nn56PvOzVt/xKl1r912oO9aHNK/mNKMmpcHaIgGj5IZHUZPHrhR9JBrtFcxCHMdiUzU20971cQjfle/adJCmotbhDueDMgVn2ygv7KHdP60lPtfcYeEgKvhpYi6c= 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)(520078)(5005006)(10201501046)(3002001);SRVR:BLUPR03MB1428;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1428; X-Forefront-PRVS: 077884B8B5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR03MB1428;23:S70Qti7dz5QrDNHsoGI0hdXET5GkK+v118TvWHN6J?= =?us-ascii?Q?3ALvBw+KkkqvAyCW4zAY9QqSjdYurava84lQ72CYQUY3t6Xm/oSo/7ZoQ4B7?= =?us-ascii?Q?+29gsBNaCTxCDxZV7nvCpkmv5Hp3f3XrW0FUPnxyiuHt0R4DXDaFQ5BTFHE3?= =?us-ascii?Q?bpcpgd1BZNKDvFZvHqD3hy3UUgz7BW7oSvrtSgaooDZGej4IeHd5GFWTxaLr?= =?us-ascii?Q?zyQxuIvEV1TpYy6l5HjTSQfSv/NqGDi10yBvWbYVeWe0Wqfns4BqwqAQYjAb?= =?us-ascii?Q?9w+Q7cWV87l3ewOXoA5TShEilWOzGOtfxZotDGnUmah8c1oh63u+MajPC6+L?= =?us-ascii?Q?XJmTYWVwudKm/0QG/bp/usIWLTA6A+YYXxzvnpUwhTo9X6O85qOk4wLA9Xjf?= =?us-ascii?Q?N2fxUMrR3irNWwC0i47YVsCKE3ZOQFrDYtfJ0yGXBDc2nuN/AW6AU9JFzh+g?= =?us-ascii?Q?DczhUCHj9GJXaK9j0dYJKvIef9MlymM2jembWPKcw6odU86iPif3y8s4kKAQ?= =?us-ascii?Q?8rRX4JstDmgRbaJGupwDhiFTGg8DaZgYBrrM4YWFz4fHCs34akZlLynykU/G?= =?us-ascii?Q?vmvQBOMle12vtX/uJyuMcwEI2OcJxawMN02VSaqx/ZyMoISPhXgMvAY7o/bc?= =?us-ascii?Q?bp9qc2TbWlKMRy/WxReBsHwCnafkUXJeHg+sGZ/tZr0ZASCX5+HgDQkz2ni/?= =?us-ascii?Q?MzlKVzpKZ3ewc1IK8VT7pslbR59Onp5Epl6ZbidNtnAnk0Yc99Lw4bZ2z6PE?= =?us-ascii?Q?00UJyhxqtW2uhgrZsWqLchAA2W7YA646Hv0k1ZMOgxPlAnNCVfMpaSofGOpt?= =?us-ascii?Q?4dPqd4YVi2d6PxFYElf95ntqdRBM485FBro+Aonbgywa6+t7d39iUFjHOLL/?= =?us-ascii?Q?WdHFR2mLYZ2pPv6trAVVyTe406YRois6WR6VqJScS2KGqPLuXgwVFftKO1Ua?= =?us-ascii?Q?sMzCHsrfyQonZv2sQONV/4f/QATZLx8G7IPDXMEFlFXqgnMiaM5lHlI1QlHo?= =?us-ascii?Q?MDwBZtLMmnx/kqHY1aWMLX8qwPkeZP816YRJEnXjUc1Hw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1428;5:4iRyDHdfjzE8HZpoVRbyyjedt+QCqCRySwV3qZFdYJoWJMm7FMSEqU9sIFXx2G+QSAncoj//SPLpvbKeRpi1FsZthqoU9QA6vq/d8sgOFB5eDp+arrYtbl5Bk2JNzuefqvlpYIUyshyObtI8OiVAzQ==;24:1rw8yhGptOMrU1ct5lijrzE6l2Qr/NX2oihzb9ClSreNUWmDGr37beffavUWnctIHrRQRW/IArSkUafrnrVMoEQDXDv0kFA9hSIoCKhdXGE= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2015 23:00:17.8181 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB1428 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org support GPMI NAND on i.MX7D Signed-off-by: Han Xu --- drivers/mtd/nand/gpmi-nand/bch-regs.h | 14 +++++++------- drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 10 ++++++---- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 27 ++++++++++++++++++++++----- drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 7 +++++-- 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/nand/gpmi-nand/bch-regs.h b/drivers/mtd/nand/gpmi-nand/bch-regs.h index 05bb91f..53e58bc 100644 --- a/drivers/mtd/nand/gpmi-nand/bch-regs.h +++ b/drivers/mtd/nand/gpmi-nand/bch-regs.h @@ -1,7 +1,7 @@ /* * Freescale GPMI NAND Flash Driver * - * Copyright 2008-2011 Freescale Semiconductor, Inc. + * Copyright 2008-2015 Freescale Semiconductor, Inc. * Copyright 2008 Embedded Alley Solutions, Inc. * * This program is free software; you can redistribute it and/or modify @@ -54,7 +54,7 @@ #define MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0 11 #define MX6Q_BM_BCH_FLASH0LAYOUT0_ECC0 (0x1f << MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0) #define BF_BCH_FLASH0LAYOUT0_ECC0(v, x) \ - (GPMI_IS_MX6(x) \ + ((GPMI_IS_MX6(x) || GPMI_IS_MX7(x)) \ ? (((v) << MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0) \ & MX6Q_BM_BCH_FLASH0LAYOUT0_ECC0) \ : (((v) << BP_BCH_FLASH0LAYOUT0_ECC0) \ @@ -65,7 +65,7 @@ #define MX6Q_BM_BCH_FLASH0LAYOUT0_GF_13_14 \ (0x1 << MX6Q_BP_BCH_FLASH0LAYOUT0_GF_13_14) #define BF_BCH_FLASH0LAYOUT0_GF(v, x) \ - ((GPMI_IS_MX6(x) && ((v) == 14)) \ + (((GPMI_IS_MX6(x) || GPMI_IS_MX7(x)) && ((v) == 14))\ ? (((1) << MX6Q_BP_BCH_FLASH0LAYOUT0_GF_13_14) \ & MX6Q_BM_BCH_FLASH0LAYOUT0_GF_13_14) \ : 0 \ @@ -77,7 +77,7 @@ #define MX6Q_BM_BCH_FLASH0LAYOUT0_DATA0_SIZE \ (0x3ff << BP_BCH_FLASH0LAYOUT0_DATA0_SIZE) #define BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(v, x) \ - (GPMI_IS_MX6(x) \ + ((GPMI_IS_MX6(x) || GPMI_IS_MX7(x)) \ ? (((v) >> 2) & MX6Q_BM_BCH_FLASH0LAYOUT0_DATA0_SIZE) \ : ((v) & BM_BCH_FLASH0LAYOUT0_DATA0_SIZE) \ ) @@ -96,7 +96,7 @@ #define MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN 11 #define MX6Q_BM_BCH_FLASH0LAYOUT1_ECCN (0x1f << MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN) #define BF_BCH_FLASH0LAYOUT1_ECCN(v, x) \ - (GPMI_IS_MX6(x) \ + ((GPMI_IS_MX6(x) || GPMI_IS_MX7(x)) \ ? (((v) << MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN) \ & MX6Q_BM_BCH_FLASH0LAYOUT1_ECCN) \ : (((v) << BP_BCH_FLASH0LAYOUT1_ECCN) \ @@ -107,7 +107,7 @@ #define MX6Q_BM_BCH_FLASH0LAYOUT1_GF_13_14 \ (0x1 << MX6Q_BP_BCH_FLASH0LAYOUT1_GF_13_14) #define BF_BCH_FLASH0LAYOUT1_GF(v, x) \ - ((GPMI_IS_MX6(x) && ((v) == 14)) \ + (((GPMI_IS_MX6(x) || GPMI_IS_MX7(x)) && ((v) == 14))\ ? (((1) << MX6Q_BP_BCH_FLASH0LAYOUT1_GF_13_14) \ & MX6Q_BM_BCH_FLASH0LAYOUT1_GF_13_14) \ : 0 \ @@ -119,7 +119,7 @@ #define MX6Q_BM_BCH_FLASH0LAYOUT1_DATAN_SIZE \ (0x3ff << BP_BCH_FLASH0LAYOUT1_DATAN_SIZE) #define BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(v, x) \ - (GPMI_IS_MX6(x) \ + ((GPMI_IS_MX6(x) || GPMI_IS_MX7(x)) \ ? (((v) >> 2) & MX6Q_BM_BCH_FLASH0LAYOUT1_DATAN_SIZE) \ : ((v) & BM_BCH_FLASH0LAYOUT1_DATAN_SIZE) \ ) diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c index 43fa16b..1f26a79 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c @@ -1,7 +1,7 @@ /* * Freescale GPMI NAND Flash Driver * - * Copyright (C) 2008-2011 Freescale Semiconductor, Inc. + * Copyright (C) 2008-2015 Freescale Semiconductor, Inc. * Copyright (C) 2008 Embedded Alley Solutions, Inc. * * This program is free software; you can redistribute it and/or modify @@ -971,7 +971,8 @@ int gpmi_extra_init(struct gpmi_nand_data *this) struct nand_chip *chip = &this->nand; /* Enable the asynchronous EDO feature. */ - if (GPMI_IS_MX6(this) && chip->onfi_version) { + if ((GPMI_IS_MX6(this) || GPMI_IS_MX7(this)) && + chip->onfi_version) { int mode = onfi_get_async_timing_mode(chip); /* We only support the timing mode 4 and mode 5. */ @@ -1093,12 +1094,13 @@ int gpmi_is_ready(struct gpmi_nand_data *this, unsigned chip) if (GPMI_IS_MX23(this)) { mask = MX23_BM_GPMI_DEBUG_READY0 << chip; reg = readl(r->gpmi_regs + HW_GPMI_DEBUG); - } else if (GPMI_IS_MX28(this) || GPMI_IS_MX6(this)) { + } else if (GPMI_IS_MX28(this) || GPMI_IS_MX6(this) || + GPMI_IS_MX7(this)) { /* * In the imx6, all the ready/busy pins are bound * together. So we only need to check chip 0. */ - if (GPMI_IS_MX6(this)) + if (GPMI_IS_MX6(this) || GPMI_IS_MX7(this)) chip = 0; /* MX28 shares the same R/B register as MX6Q. */ diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 298c1d1..9f67f0f 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -77,6 +77,12 @@ static const struct gpmi_devdata gpmi_devdata_imx6sx = { .max_chain_delay = 12, }; +static const struct gpmi_devdata gpmi_devdata_imx7d = { + .type = IS_MX7D, + .bch_max_ecc_strength = 62, + .max_chain_delay = 12, +}; + static irqreturn_t bch_irq(int irq, void *cookie) { struct gpmi_nand_data *this = cookie; @@ -575,6 +581,10 @@ static char *extra_clks_for_mx6q[GPMI_CLK_MAX] = { "gpmi_apb", "gpmi_bch", "gpmi_bch_apb", "per1_bch", }; +static char *extra_clks_for_mx7d[GPMI_CLK_MAX] = { + "gpmi_bch_apb", +}; + static int gpmi_get_clks(struct gpmi_nand_data *this) { struct resources *r = &this->resources; @@ -592,6 +602,8 @@ static int gpmi_get_clks(struct gpmi_nand_data *this) /* Get extra clocks */ if (GPMI_IS_MX6(this)) extra_clks = extra_clks_for_mx6q; + if (GPMI_IS_MX7(this)) + extra_clks = extra_clks_for_mx7d; if (!extra_clks) return 0; @@ -608,7 +620,7 @@ static int gpmi_get_clks(struct gpmi_nand_data *this) r->clock[i] = clk; } - if (GPMI_IS_MX6(this)) + if (GPMI_IS_MX6(this) || GPMI_IS_MX7(this)) /* * Set the default value for the gpmi clock. * @@ -1869,8 +1881,8 @@ 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) && - ((bch_geo->gf_len * bch_geo->ecc_strength) % 8) == 0) { + if ((GPMI_IS_MX6(this) || GPMI_IS_MX7(this)) && + ((bch_geo->gf_len * bch_geo->ecc_strength) % 8) == 0) { ecc->read_subpage = gpmi_ecc_read_subpage; chip->options |= NAND_SUBPAGE_READ; } @@ -1936,7 +1948,8 @@ static int gpmi_nand_init(struct gpmi_nand_data *this) if (ret) goto err_out; - ret = nand_scan_ident(mtd, GPMI_IS_MX6(this) ? 2 : 1, NULL); + ret = nand_scan_ident(mtd, GPMI_IS_MX6(this) || + GPMI_IS_MX7(this) ? 2 : 1, NULL); if (ret) goto err_out; @@ -1979,7 +1992,11 @@ static const struct of_device_id gpmi_nand_id_table[] = { }, { .compatible = "fsl,imx6sx-gpmi-nand", .data = &gpmi_devdata_imx6sx, - }, {} + }, { + .compatible = "fsl,imx7d-gpmi-nand", + .data = (void *)&gpmi_devdata_imx7d, + }, { /* sentinel */ } + }; MODULE_DEVICE_TABLE(of, gpmi_nand_id_table); diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h index 544062f..58b3d69 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h @@ -1,7 +1,7 @@ /* * Freescale GPMI NAND Flash Driver * - * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. + * Copyright (C) 2010-2015 Freescale Semiconductor, Inc. * Copyright (C) 2008 Embedded Alley Solutions, Inc. * * This program is free software; you can redistribute it and/or modify @@ -123,7 +123,8 @@ enum gpmi_type { IS_MX23, IS_MX28, IS_MX6Q, - IS_MX6SX + IS_MX6SX, + IS_MX7D, }; struct gpmi_devdata { @@ -306,6 +307,8 @@ void gpmi_copy_bits(u8 *dst, size_t dst_bit_off, #define GPMI_IS_MX28(x) ((x)->devdata->type == IS_MX28) #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_MX6(x) (GPMI_IS_MX6Q(x) || GPMI_IS_MX6SX(x)) +#define GPMI_IS_MX7(x) (GPMI_IS_MX7D(x)) #endif -- 1.9.1