From patchwork Fri May 17 11:50:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pekon gupta X-Patchwork-Id: 244619 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3BA472C00A1 for ; Fri, 17 May 2013 21:52:20 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UdJCE-000240-CI; Fri, 17 May 2013 11:51:38 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UdJC7-0003Th-LI; Fri, 17 May 2013 11:51:31 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UdJBt-0003Qr-JI for linux-mtd@lists.infradead.org; Fri, 17 May 2013 11:51:19 +0000 Received: from dbdlxv05.itg.ti.com ([172.24.171.60]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r4HBoXXu018486; Fri, 17 May 2013 06:50:34 -0500 Received: from DBDE72.ent.ti.com (dbde72.ent.ti.com [172.24.171.97]) by dbdlxv05.itg.ti.com (8.14.3/8.13.8) with ESMTP id r4HBoSkv004139; Fri, 17 May 2013 06:50:32 -0500 Received: from dbdp32.itg.ti.com (172.24.170.251) by DBDE72.ent.ti.com (172.24.171.97) with Microsoft SMTP Server id 14.2.342.3; Fri, 17 May 2013 19:50:28 +0800 Received: from psplinux064.india.ti.com (smtpvbd.itg.ti.com [172.24.170.250]) by dbdp32.itg.ti.com (8.13.8/8.13.8) with ESMTP id r4HBoNG2008737; Fri, 17 May 2013 17:20:28 +0530 From: "Gupta, Pekon" To: , Subject: [PATCH 4/4 v2] ARM: OMAP2+: updated ECC scheme attributes for omap2-nand DT Date: Fri, 17 May 2013 17:20:18 +0530 Message-ID: <1368791418-14330-5-git-send-email-pekon@ti.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1368791418-14330-1-git-send-email-pekon@ti.com> References: <1368791418-14330-1-git-send-email-pekon@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130517_075117_814489_93366DAC X-CRM114-Status: GOOD ( 10.38 ) X-Spam-Score: -7.5 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [198.47.26.153 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arnd@arndb.de, tony@atomide.com, jp.francois@cynove.com, balbi@ti.com, "Gupta, Pekon" X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: "Gupta, Pekon" Updates ECC scheme selection string same to same as used in omap2-driver code. This makes the DT configurations easy to understand and map to actual code. Signed-off-by: Gupta, Pekon --- .../devicetree/bindings/mtd/gpmc-nand.txt | 47 ++++++++++++++-------- arch/arm/boot/dts/am335x-evm.dts | 2 +- arch/arm/mach-omap2/gpmc.c | 19 +++++---- 3 files changed, 43 insertions(+), 25 deletions(-) diff --git a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt index de180be..c7a4add 100644 --- a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt +++ b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt @@ -25,22 +25,37 @@ Optional properties: - ti,nand-ecc-opt: Determines the ECC scheme used by driver. It can be any of the following strings: - "hamming_sw" 1-bit Hamming ECC using software - - "hamming_hw" 1-bit Hamming ECC using hardware - - "hamming_hw_romcode" 1-bit Hamming ECC using hardware - - ECC layout compatible to ROM code - - "bch8_hw_detection_sw" 8-bit BCH with ECC calculation in hardware - and error detection in software - - requires Kconfig CONFIG_MTD_NAND_ECC_BCH - - "bch8_hw" 8-bit BCH with ECC calculation in hardware - and error detection in hardware - - requires to be specified - - requires Kconfig CONFIG_MTD_NAND_OMAP_BCH - + "OMAP_ECC_HAMMING_CODE_SW" + 1-bit Hamming ECC using software. + + "OMAP_ECC_HAMMING_CODE_HW" + 1-bit Hamming ECC using hardware. + + "OMAP_ECC_HAMMING_CODE_HW_ROMCODE" + 1-bit Hamming ECC using hardware with + ECC layout compatible to ROM code. + + "OMAP_ECC_BCH4_CODE_HW_DETECTION_SW" + 4-bit BCH with ECC calculation in + hardware & error detection in software. + - requires CONFIG_MTD_NAND_ECC_BCH + + "OMAP_ECC_BCH4_CODE_HW" + 4-bit BCH with ECC calculation in + hardware & error detection in hardware. + - requires CONFIG_MTD_NAND_OMAP_BCH + - requires to be specified + + "OMAP_ECC_BCH8_CODE_HW_DETECTION_SW" + 8-bit BCH with ECC calculation in + hardware & error detection in software. + - requires CONFIG_MTD_NAND_ECC_BCH + + "OMAP_ECC_BCH8_CODE_HW" + 8-bit BCH with ECC calculation in + hardware & error detection in hardware. + - requires CONFIG_MTD_NAND_OMAP_BCH + - requires to be specified - elm_id: Specifies elm device node. This is required to diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 60e8f59..1107761 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -135,7 +135,7 @@ nand@0,0 { reg = <0 0 0>; /* CS0, offset 0 */ nand-bus-width = <8>; - ti,nand-ecc-opt = "bch8_hw"; + ti,nand-ecc-opt = "OMAP_ECC_BCH8_CODE_HW"; gpmc,sync-clk = <0>; gpmc,cs-on = <0>; diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 03b8027..e3146c3 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -1205,13 +1205,16 @@ static void __maybe_unused gpmc_read_timings_dt(struct device_node *np, #ifdef CONFIG_MTD_NAND static const char * const nand_ecc_opts[] = { - [OMAP_ECC_HAMMING_CODE_DEFAULT] = "hamming_sw", - [OMAP_ECC_HAMMING_CODE_HW] = "hamming_hw", - [OMAP_ECC_HAMMING_CODE_HW_ROMCODE] = "hamming_hw_romcode", - [OMAP_ECC_BCH4_CODE_HW] = "bch4_hw", - [OMAP_ECC_BCH4_CODE_HW_DETECTION_SW] = "bch4_hw_detection_sw", - [OMAP_ECC_BCH8_CODE_HW] = "bch8_hw", - [OMAP_ECC_BCH8_CODE_HW_DETECTION_SW] = "bch8_hw_detection_sw" + [OMAP_ECC_HAMMING_CODE_DEFAULT] = "OMAP_ECC_HAMMING_CODE_SW", + [OMAP_ECC_HAMMING_CODE_HW] = "OMAP_ECC_HAMMING_CODE_HW", + [OMAP_ECC_HAMMING_CODE_HW_ROMCODE] = + "OMAP_ECC_HAMMING_CODE_HW_ROMCODE", + [OMAP_ECC_BCH4_CODE_HW_DETECTION_SW] = + "OMAP_ECC_BCH4_CODE_HW_DETECTION_SW", + [OMAP_ECC_BCH4_CODE_HW] = "OMAP_ECC_BCH4_CODE_HW", + [OMAP_ECC_BCH8_CODE_HW_DETECTION_SW] = + "OMAP_ECC_BCH8_CODE_HW_DETECTION_SW", + [OMAP_ECC_BCH8_CODE_HW] = "OMAP_ECC_BCH8_CODE_HW" }; static int gpmc_probe_nand_child(struct platform_device *pdev, @@ -1238,7 +1241,7 @@ static int gpmc_probe_nand_child(struct platform_device *pdev, if (!of_property_read_string(child, "ti,nand-ecc-opt", &s)) for (val = 0; val < ARRAY_SIZE(nand_ecc_opts); val++) - if (!strcasecmp(s, nand_ecc_opts[val])) { + if (!strcmp(s, nand_ecc_opts[val])) { gpmc_nand_data->ecc_opt = val; break; }