From patchwork Fri Mar 28 10:35:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lothar_Wa=C3=9Fmann?= X-Patchwork-Id: 334651 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6F79C14007C for ; Fri, 28 Mar 2014 21:37:22 +1100 (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 1WTU9i-0003qn-FS; Fri, 28 Mar 2014 10:36:58 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WTU9g-0000KS-0X; Fri, 28 Mar 2014 10:36:56 +0000 Received: from mail.karo-electronics.de ([81.173.242.67]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WTU9S-0000Hr-J0; Fri, 28 Mar 2014 10:36:43 +0000 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= To: Arnd Bergmann , Artem Bityutskiy , Brian Norris , David Woodhouse , Fabio Estevam , Huang Shijie , Ian Campbell , Kumar Gala , =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= , Mark Rutland , Pawel Moll , Rob Herring , Rob Landley , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Shawn Guo , Boris BREZILLON , Ezequiel Garcia , Grant Likely , Jingoo Han , Michael Grzeschik , Michael Opdenacker , Wei Yongjun Subject: [PATCHv3 2/2] of/mtd/nand: add generic binding and helper for NAND_BBT_NO_OOB_BBM Date: Fri, 28 Mar 2014 11:35:07 +0100 Message-Id: <1396002907-17750-3-git-send-email-LW@KARO-electronics.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1396002907-17750-1-git-send-email-LW@KARO-electronics.de> References: <1395235406-13449-1-git-send-email-y> <1396002907-17750-1-git-send-email-LW@KARO-electronics.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140328_063642_895502_155A60A5 X-CRM114-Status: GOOD ( 13.49 ) X-Spam-Score: -3.0 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [81.173.242.67 listed in list.dnswl.org] -0.4 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] 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 add a boolean property 'nand-no-oob-bbm' and helper function to be able to set the NAND_BBT_NO_OOB_BBM flag in DT capable NAND drivers and use it for i.MX and MXS nand drivers. Signed-off-by: Lothar Waßmann --- Documentation/devicetree/bindings/mtd/nand.txt | 1 + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 3 +++ drivers/mtd/nand/mxc_nand.c | 2 ++ drivers/of/of_mtd.c | 12 ++++++++++++ include/linux/of_mtd.h | 6 ++++++ 5 files changed, 24 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/nand.txt b/Documentation/devicetree/bindings/mtd/nand.txt index b53f92e..e46bfbe 100644 --- a/Documentation/devicetree/bindings/mtd/nand.txt +++ b/Documentation/devicetree/bindings/mtd/nand.txt @@ -5,6 +5,7 @@ "soft_bch". - nand-bus-width : 8 or 16 bus width if not present 8 - nand-on-flash-bbt: boolean to enable on flash bbt option if not present false +- nand-no-oob-bbm: boolean to disable writing bad block markers to flash - nand-ecc-strength: integer representing the number of bits to correct per ECC step. diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 2a489b3..c23f27b 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -1707,6 +1707,9 @@ static int gpmi_nand_init(struct gpmi_nand_data *this) if (of_get_nand_on_flash_bbt(this->dev->of_node)) { chip->bbt_options |= NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB; + if (of_get_nand_no_oob_bbm(this->dev->of_node)) + chip->bbt_options |= NAND_BBT_NO_OOB_BBM; + if (of_property_read_bool(this->dev->of_node, "fsl,no-blockmark-swap")) this->swap_block_mark = false; diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index dba262b..bb54a2a 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -1496,6 +1496,8 @@ static int mxcnd_probe(struct platform_device *pdev) this->bbt_md = &bbt_mirror_descr; /* update flash based bbt */ this->bbt_options |= NAND_BBT_USE_FLASH; + if (of_get_nand_no_oob_bbm(pdev->dev.of_node)) + this->bbt_options |= NAND_BBT_NO_OOB_BBM; } init_completion(&host->op_completion); diff --git a/drivers/of/of_mtd.c b/drivers/of/of_mtd.c index b7361ed..d947acc 100644 --- a/drivers/of/of_mtd.c +++ b/drivers/of/of_mtd.c @@ -117,3 +117,15 @@ bool of_get_nand_on_flash_bbt(struct device_node *np) return of_property_read_bool(np, "nand-on-flash-bbt"); } EXPORT_SYMBOL_GPL(of_get_nand_on_flash_bbt); + +/** + * of_get_nand_no_oob_bbm - Get nand no oob bbm for given device_node + * @np: Pointer to the given device_node + * + * return true if present, false otherwise + */ +bool of_get_nand_no_oob_bbm(struct device_node *np) +{ + return of_property_read_bool(np, "nand-no-oob-bbm"); +} +EXPORT_SYMBOL_GPL(of_get_nand_no_oob_bbm); diff --git a/include/linux/of_mtd.h b/include/linux/of_mtd.h index e266caa..6ece1a9 100644 --- a/include/linux/of_mtd.h +++ b/include/linux/of_mtd.h @@ -17,6 +17,7 @@ int of_get_nand_ecc_step_size(struct device_node *np); int of_get_nand_ecc_strength(struct device_node *np); int of_get_nand_bus_width(struct device_node *np); bool of_get_nand_on_flash_bbt(struct device_node *np); +bool of_get_nand_no_oob_bbm(struct device_node *np); #else /* CONFIG_OF_MTD */ @@ -45,6 +46,11 @@ static inline bool of_get_nand_on_flash_bbt(struct device_node *np) return false; } +static inline bool of_get_nand_no_oob_bbm(struct device_node *np) +{ + return false; +} + #endif /* CONFIG_OF_MTD */ #endif /* __LINUX_OF_MTD_H */