From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756685AbbJUWIG (ORCPT ); Wed, 21 Oct 2015 18:08:06 -0400 Received: from mail-bl2on0121.outbound.protection.outlook.com ([65.55.169.121]:43339 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752955AbbJUWIB (ORCPT ); Wed, 21 Oct 2015 18:08:01 -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 v5 5/7] mtd: nand: gpmi: add GPMI NAND support for i.MX7D Date: Wed, 21 Oct 2015 16:41:39 -0500 Message-ID: <1445463701-5921-6-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445463701-5921-1-git-send-email-b45815@freescale.com> References: <1445463701-5921-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD023;1:22jwxzNM3nZvAv7P6KQ86fDtkE1QJamZepN7NizP2BfpmiEUI+oa7WL0po7dMfHVGy4J4roJMOncOvTX/MuOdqpc75AqWFu4ER+4o63LeRLuSJa/94Su7hyrZ58WsXqAEKA+rJbr409mLYMfiebqqP7PT6DHN3T2NuIkT3SfAwmn0S2zXbhHxs8OauFuoQLD5ppGM5fhMJFsgaHNZRvTMjnZiVdOiK0JfMWzKWk4O81QWbzHiv/cAcbpVz97PAJAwEGnYEGrENKHJhr3T6yXcKfcm6rgAN2RrcphNmJLl4mY4nYHxQbC2WJ8qtSbEMBI2r7m/aLvfYS3HIyQ0scZbWMCilgqLW8YPhL8WKshYiIHSg7v659ubONh4nzThhSDb8NVZLuNIG5zTeKuSOrZng== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(19580395003)(106466001)(64706001)(85426001)(47776003)(6806005)(19580405001)(104016004)(5003940100001)(110136002)(5001960100002)(2351001)(11100500001)(87936001)(50466002)(97736004)(189998001)(81156007)(229853001)(5007970100001)(46102003)(92566002)(2950100001)(33646002)(50226001)(76176999)(36756003)(575784001)(50986999)(48376002)(77096005)(5008740100001)(105606002)(2004002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR03MB553;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB553;2:edvYjPUF7OAnumVkaL4qHk1zpaaNMVcf8BM6fTSeH5b9QJHXSENY+6SNcKmOZRb0uV2TqFwjSe97A0C+DnftlZA8QILbTruBz7Nh0Au2ZcoL8k6mY3nmi6nTmwzZtsd8zcnPH7ZgRd1mgizWvOY0gWFwwup5WVU589xmnpHaiQ8=;3:e7t9/9AJOJFmlHnl0TiC4La0AF2+FB7wdFLSLhp+dz7R4qO00P5w31QBq+x9I4/M9/3699ZUTo4LyYWKVlCdmV8m4PkBBW7FDUASpp+7LetSYLZKMnNFgJT2S4MlKX7WRnH57OXmvsvdDTOTUdTCRPjEt9q9B46hiAo8cKko0sOv6+1TFeQWjwT7bv7UogrdoDz8S/v2SPaMWxJrdFwXOvwrlehBiRrtF6Kk/lBp8tA=;25:xbbOXh1XG1hujsfPZ9v8tiDP0P6Wl2hVQCBvu3kkJlQn7yrzMjAqPfWI/MNwRJji7PgSRj3BNN+navtjAEB88UMC71VbD6MEvworD+mRsLOvRrOV2W26rHNO48E7qJ8+3cfgeRK/LQFJeVY+td5GKFfshRAOoaF1nZ9jvkrwUEd57svmkjoCiYR/K5FhfP3z7veGCs93CdyNLroelyUJp6oodEcLAKTAUo6Vg+daQHx8wx1RMnRsyge53pHYoFTb X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB553; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB553;20:CUHHW4G+qzcFvw4EboLUkb8598H3h+eJ3auZ6hN/z6va119ABpfiX/BIcsD8QO6cgz7yPiOrF913EihOsCQAei8+++E3pqBrpHXmt3cP6ojgVM1PudD8S+x+hwrNBnxE4RduejF2xr+Le+bHNEP1F45ViniV+CUDQaHi7npONZqsDeofu/ckpw+5doU2X43aTYE7tyvDqcbmtznKZwusaqNFoma5oj6GA1MyK4aFMgcEQNWtKoIrS5mBWn497jFRavpYAFDC+aTPw4pQUKqR0u7myaOMsMupIH59etaOp5LKcE2TIX4eQeaEFUV6NhQGE4T/TtKwJgYK4Wi24P32+ZHq/7/1g7fJ8eDbkSEjZzE=;4:OI4FKEUgQTtD98IsUrM0KzCKYVAcwuUgG5W8likaHOGuRXEwiK5cyBV2RyZGGQDLlg33RVFXxIQ3+Aaeg5GWtXADJDLWmjSqtP+WjkHuW1V+rkF6qpBrbZS6j2c8mURJUzC19Oblr50E76GGntdwBzBZGKnR/EbDHbV3Pl4wBYE1Xakqmz3g18mXASBqAhyLAzTIKIEuKlzr1i4/MdpUDqxqYXzo3KwRlycDNXNmJzMB94Zwx5ik+8h4Eejp02uUVTSmRO1ApEtkuKcXBq+KQpxnMVrKoH8Je8eqU/slzSoqZfzXJUxxgO68SDF+akeK0+1Z99Cs406LB5F71UMIUh71uqjCVlSCz80faaVDRSunS8w3pJp7onTw+S9MT4C1 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001)(102115026);SRVR:BY2PR03MB553;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB553; X-Forefront-PRVS: 073631BD3D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB553;23:KbC/kYepOZuHQT6gg9D9157c/MTf41C2/+ZsUT3rKl?= =?us-ascii?Q?wqqponCW6s7LxQ51kdtKDgJFC5fK6LgQ+9N6Kuo3AhouaQaF29JL8qvJrwx5?= =?us-ascii?Q?dggZhpVp12Te+zJgYDC5kOZs8m+yeMj25OXbvY6qT03meyXKJdcQtSxfw8CB?= =?us-ascii?Q?oZ5WNDkj4aIQpre6vjB3KcekqcfMTs8z78YmCJatJTnD+XXEdm40eDyThHYC?= =?us-ascii?Q?vLwcZCpWbwYyHo3wEGOi1CU3hmievshMDUy8eVIFCNzR/sTo3c01jhff1507?= =?us-ascii?Q?NCfwPeIatyOWikoBHNY19TkZcBRt5I5vKMxsMLNd1Hcrfu7uGXnSH3KT+fx2?= =?us-ascii?Q?8J/MJtmJbEcoW7YZKuMazPplESUx0WJC4Ec6TwR0+LqBQDguXkOBr8UivyTK?= =?us-ascii?Q?d6ebtr3GKquIPkqOV8+apSnNJBDCCqFldj5fcyikHcPEhB1iSEUz35ngfNKG?= =?us-ascii?Q?pCno3zt2yly/93qxeXlweodyuxg6FUgpBpCSrEPSJSB+PLJ9304soyj1Ct0S?= =?us-ascii?Q?bJMvMX0DBFstkF6SAiftCnTOVhDxUhj2YXYhmWqnqpXqSILVd6h0Isj1KlPr?= =?us-ascii?Q?xRnGqURU/Hj9jU41M7C1jHycfsvOCp6bAPtQmepX0IvmVh+c5YAhKcowMUxk?= =?us-ascii?Q?fqYM0SR/xyRH2ShjCtidzy2+1HPh/NA2yH2004syuyLsboTX/O+rUURiSJy3?= =?us-ascii?Q?6t/XjVxOli0miy3xwUwUQErqJqBylNOuInra7BW1TVXGfU6m3CbZ1n0oJv2c?= =?us-ascii?Q?qjRhc2bqoUsxsmsP7uuEaGY4O2ObQoySDO3fp7XNYW1pXQMX1rq4W5GyXPSU?= =?us-ascii?Q?q3zFSzjeWgD3wnRNJIMm7+4vVf410wO8N1roGCpEvXOxa0bnTkDsMjdC35p1?= =?us-ascii?Q?yMmeJdxld3MCuFF2cCX7gasbrYdDawwjaAROHtfhj1Mf3tSaTEToZVT3sj/J?= =?us-ascii?Q?Y7BCteCNaruvmWT8kHz0hKorpWpkBU84j4hfRgHmZxxzwiFV78FrRJb3Lmp9?= =?us-ascii?Q?tZ7mB6Ee/jC+FSfza2ghjpUpIYERevAJRJSU1yJrI3UsEacCRTBh16t9uQyi?= =?us-ascii?Q?QIosJICmMyNZzjyBqkl2gAwzGJ4FJOmQBprpR19JRxYpPAmznKuFFGFQPDHM?= =?us-ascii?Q?EM2svVBI8=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB553;5:egfLH5MhUbBUbul1ui+RKvttq9oUm0S0KqatdjBAaaTgMRBRspJFXXxJ3t2Ij/WwaChcl9lP/CYOWzl/wwvde1WzKMltWeGD2pA8a/9JCP0UPD+9ty+o0F0hahu77KRQ3Wfm6DG+X1mw6vTtgc+53A==;24:j9DERVEtYzgFtn1HK4w5SIq3Pd7K1XQ1pmosLhVJLuXtL7i4jTk69kRnmMluz8OHAS2WtJ1Ar6apR29kKnGd7C9SSgLlZVd8dkECfcQmdhY=;20:vsW6chQ5D+vldGGob09H7ghRprz5xsKhpuKgDQXYGoHx+/jjAia12S/dkCz2GvE96oZo1jcYDy8qdkMI2SH2Lw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2015 21:52:36.1526 (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 | 26 +++++++++++++++++++++----- drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 7 +++++-- 4 files changed, 39 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 998fa88..9eacc24 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,10 @@ 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, + } }; 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