From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755068AbbJ0WSG (ORCPT ); Tue, 27 Oct 2015 18:18:06 -0400 Received: from mail-bn1bon0147.outbound.protection.outlook.com ([157.56.111.147]:24608 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754397AbbJ0WQy (ORCPT ); Tue, 27 Oct 2015 18:16:54 -0400 Authentication-Results: spf=fail (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 v7 5/7] mtd: nand: gpmi: add GPMI NAND support for i.MX7D Date: Tue, 27 Oct 2015 17:05:38 -0500 Message-ID: <1445983540-27155-6-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445983540-27155-1-git-send-email-b45815@freescale.com> References: <1445983540-27155-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD030;1:U+wPvgdxNsf7D2MibHsECjgL5bXWY9cGZfT07uHwZCtCKX8yGJDcfcod0JiggOm4GM0AABKuPjD35BGA8S76rr5Z3l/pQBBURKNC4+AEcwY7RrN33JzyXI6LgxG2lKdHASshGnnu5LVJXY0O1RqPohb+QRQsOcENkYs8XChv3u18gp7J0SlZtHCdphcLwHkOVGzqtOpmIQUo+hxmKT8rN4CaMJDy5a9xcBWesLRZMU/USMRNhG0Qcnsus3cCUKublDNXR265WOmu1Ne4S0u9E3/hK+ET/23Q0gcx+SKJpnuGFg8bNaIueNrGNVTD2yjLAvGQT0LdPH7ylMiqQ9mN0MRTrgc39p2Efqc+mkBq3TfnxGiwyOcWy+1O42OwICkeoDRms8ZbUqZWeBc0S2dPUw== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(19580405001)(19580395003)(6806005)(575784001)(85426001)(50466002)(5008740100001)(47776003)(76176999)(104016004)(5001960100002)(48376002)(50986999)(87936001)(2950100001)(11100500001)(105606002)(110136002)(92566002)(106466001)(77096005)(2351001)(33646002)(189998001)(36756003)(50226001)(5003940100001)(97736004)(81156007)(5007970100001)(229853001)(2004002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR03MB553;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB553;2:i/ELnxUA+d/g/qVWKbillLb59B869Ie/K8G+S1jEYrj5jgwFHn8ipuBKgnFBO2mSAM+3/He60oJ87poG4HZTr0xH6XBFeiNh2TT6Rn4NBiS8znYRYamLervse89Cp5P9Sick0IMJ9L0UwY8uJjRBgfBNfHRXL1GS1IWjPEgGliA=;3:xmIhbYv+zaZFMB6CwZJRxwPt83OBV88ls2IJZ8L42aK01b48KmfJ8Vw3REGnjvIPO2+Z64NOzQtvZ5XuSPHfUxhPekpwlY9hNTLvDxWuNiGV0HtpVRjz6kEE5kq2OaVWBw5TjSHemBdq64pl0pcOdjrp5eAJ54oRWejzC9ETcUnheVpM1UEXyFlu8Zm+kUmGRpuBGfL+xj12FVj/qWLhturcithBWP5cBD2026CHY40=;25:vEqozO3HrEncsHGfLDGzJZ8vtavdEOJByemQyyinUUBJfC1Qm/6u7EVdGumRx/R+I+tSTZvHt0okpXlO26+JSinWf7HAiXM5lDHpZmdk9xFKWyujkjQLWT+9zduStPZjNlRrgV4HoqUMfFiRoWAi1W94xikj9hRcHFCK4hVQ8PpA5J6gAPBrm5YX+eVE2FtFzkx0lX0XriQRLGgWhRa0mehboUnUvjZnAa89xKN2xQ/nd/TSX+sJe2/uhevtoZat X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB553; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB553;20:7WYqA2cQLWmib8ylXvpbs6PLQjA7SvNKYvv3zD9lLAA0WpRNwmq2dHfrvSAMqzp+JOD9BF+THtgo3XW7dfk7EVuMOfSmeh+VKkecfChwo+4rNNw+UzIrdPjGesd4KaPAkok3BLRvXgtH7yq6v+26H93HirVulb6HHb+llH6r5Ppdu+QKpZfg9kYwcOSHe0O/G1ArH5bIWP//GP9Pqyl+odIWyCrDcjjzK9voYT5AYhzLc0vH5qem5Vt+RC0o8/dIYuUtIk7zISkrUSG3s4Y5DM3HW/jPpk6y5cKnNQTQqQ0RiF00z8ZIVSTsccgRWoMRVczAzhB6d0VzOwqqoVl0VN+Fiv6oNJ37fhigRXfA7nU=;4:jrtIxFCHUMKuMaSm4pi02PJFBYorQ910nKK/5Y4yeqCUCfUyLfhwqxBivFUzL8XBvYYnZP/AWQ+d0LTde5aoPIR2WVpF8XMuIMFLoehtVs6n1RsF2QuvuvRiPT/CFvvU/zJ+fNGBKGW36h3kNbVqQOocN4hlxgoFH8g9HO4YAIBuiR42phDKZPmUTTLdAaVXQU2ofQebZSyXSrr30747u8xKLI9SebYhkxNpbaO0/w5q09HQcVtqoaWtZBKPrchOmDadizW21bVE/b4qFqz1dc3fUn1jzMGx28fiUoVBrXb0sE5RRez3x8MDtw8a+PWJLlUD3ZaZ7xPA7/vH9mT+CasHFW6OTljBp85D9J+RGZTbsLUnpWyDF9wxd00EB6LgpgIr3cp+Eq2yJ/beWvEEkQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(10201501037)(102215026);SRVR:BY2PR03MB553;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB553; X-Forefront-PRVS: 0742443479 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB553;23:R4gaeXwKqjPXdvaCuJGytrJk0/famgdxw0jKFySw1B?= =?us-ascii?Q?LrgnO40NCCg9TU1V4CdDHRkLM2cFJg/aHEDLuGy2HuppoZ2xSSJK+SxNPQYK?= =?us-ascii?Q?Lm4n1G+dtKewodITdaWHuN1WaYoYb9V/thEP6sZel1DVeXtQKSqMPbJmrKa2?= =?us-ascii?Q?oU2XULjVhq03eTrDbo+Mycom5y9m4Ik+v41zSgiCsP80bTExtAT31+ZlqU92?= =?us-ascii?Q?uLZbd5qsrmuuVwkrgjprblpDe+txsMXX774sE84gjtJf2+W3lzPkPYf1rgl0?= =?us-ascii?Q?vCp4hqff5oo3LqnFljplwSWimnHzZo08lPa0fr1XitowPoxssMn/wT98DNBJ?= =?us-ascii?Q?govXbXtcG5KWi/sXd7CbT0yN7wDn3TIdBOoVR2dxCnqjxuFGWd9mKmzorIaJ?= =?us-ascii?Q?koPaF8BvebU7t4fJny/JP6Hm6/hntt+RevgbuFcO9DhfRzWHLE1in8MZ4FI4?= =?us-ascii?Q?Y4S+OqJLO7O4UIvfppv+8tfmhumwQjvR6leopoyExbwgK0rs7ERx3Rwr0bQk?= =?us-ascii?Q?kvvcPSthtBfE/EYr7/HHdLOxxiwNJpa+RbC/cUlYon0BYhMQz+Trts1tptdc?= =?us-ascii?Q?cMG2fJu5yHptEAWcLUvMPjlK8RtNU0TE+sMXMzk/gu48mEeNCsIZln4GoP7k?= =?us-ascii?Q?HUlsPKQmFzyU0CxBLK9MNdZEKTVU2Vx4Ipp+jWsSOYHS0N977nqexg5Ue/Sy?= =?us-ascii?Q?ucNmGxwB7E7yPetw9dD2ObcPreqVYzmLTghy0VTTW6IybidDrpdqDFNqqK7F?= =?us-ascii?Q?oGPMWNk5oRoBxn1pZ3xuZmvsqZLWR9xo2txDN0wVrUVJ07/pUVplk3GYHBKK?= =?us-ascii?Q?zIIhGWQQms/0GC41PuChSE7xaetq6m42dwNbWFLohUFwsmqXeRYuf04o88J7?= =?us-ascii?Q?uOz+9bELuRBXyM5VRi3prPPRN5f8veXdM3/2n9ge5NiqNmmGYVDQ3Sut/B4a?= =?us-ascii?Q?pMsVYgu4tlNDNcUlKRcR3QSewyt6CiR5DwCu/4ZCWrL24unJsqT7xN0IlgYQ?= =?us-ascii?Q?n9JzT3U6xO7Uekmh1hqbP/P+l7XIHILWFfvt5jjBYR9Ac3jJQgXCR7qOjiLQ?= =?us-ascii?Q?2bF/SPBzfo0lPRnI1oqMK4jAZ6?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB553;5:uT2uievX1j7X6Xm9kLSgfSNtChkv8x4X4FUU6NGeozE65RhjJsMR3RBxdLOILNYus8l9CqZLTAJPJbXZ8xsM8LYY4zhpDoyokflimNY7PA70hJ5Pe1sOX3Be5IY90zLgNMv5s90q1XtjapsMtk2Prg==;24:pMA04ffTpP0oTTPtl3mMfkATL3sFWMpXcVHOrviytNE7N2LAaOJODJsZZ0uaTK890R+M7HeKf4Tx/eiA4fb0y6wRTAVXND80v30b/58Yduw=;20:/JEyVsQcATyz0cL6DQ+Vp7KI9CfFlRC2gF0AoKKJwyElnHcJIkc5mge0SWX+HPZO6YLiP7xzJu8yjfbZEstCXw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2015 22:16:49.8960 (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: BY2PR03MB553 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 d8f2403..8339a44 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; @@ -1980,7 +1993,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