From patchwork Wed May 24 07:07:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UGV0ZXIgUGFuIOa9mOagiyAocGV0ZXJwYW5kb25nKQ==?= X-Patchwork-Id: 766338 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wXjxh4jYWz9sP4 for ; Wed, 24 May 2017 17:02:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GhpS21Nc"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5LB2mpP4+kTf6hTVAAJwgmozMYPBIhti5NXBiAiIw3c=; b=GhpS21NcSpt/zt DlvolhSJyvQGcWUy0aaawCCis+aPh17JGCPqDNbZ1r+wMteUNbquvaAx6VjeHyQzenDkEPMDm/Q37 1SqMA5Kmnt1k3Nzrjko4IiQSjWQqHbzIKvqqMceJe4IbYMC2c2+7B8V9SuZBfdXVNnq7OzoeQqAQo yc0eoe7HDebVYdrFGuC7TIQyQF7XntSNhNPAaT5zz8zBSwuZMqUvBZPrUJNvs4AGAnpSTVHWCcRTe YQDnEm1b3PomeCDwGLhvUCZIqFdrSO1lpxai7ACOstWamL4qOCLs/5XzzncEgM4EOSbNmaLGMIMZy ec53bsva+BJHpIfNPlVA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dDQIv-0001pb-Le; Wed, 24 May 2017 07:01:57 +0000 Received: from mailout.micron.com ([137.201.242.129]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dDQHt-0000GL-Gz for linux-mtd@lists.infradead.org; Wed, 24 May 2017 07:01:01 +0000 Received: from mail.micron.com (bowex36c.micron.com [137.201.84.132]) by mailout.micron.com (8.14.4/8.14.6) with ESMTP id v4O70PAo015223; Wed, 24 May 2017 01:00:25 -0600 Received: from SIWEX4E.sing.micron.com (10.160.29.69) by bowex36c.micron.com (137.201.84.132) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Wed, 24 May 2017 01:00:24 -0600 Received: from BOWEX36G.micron.com (137.201.84.120) by SIWEX4E.sing.micron.com (10.160.29.69) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Wed, 24 May 2017 15:00:14 +0800 Received: from peterpan-Linux-Desktop.micron.com (10.66.12.56) by BOWEX36G.micron.com (137.201.84.120) with Microsoft SMTP Server id 15.0.1263.5 via Frontend Transport; Wed, 24 May 2017 01:00:11 -0600 From: Peter Pan To: , , , , , , , Subject: [PATCH v6 07/15] mtd: nand: move BBT code to drivers/mtd/nand/ Date: Wed, 24 May 2017 15:07:03 +0800 Message-ID: <1495609631-18880-8-git-send-email-peterpandong@micron.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1495609631-18880-1-git-send-email-peterpandong@micron.com> References: <1495609631-18880-1-git-send-email-peterpandong@micron.com> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-12.0.0.1464-8.100.1062-23088.005 X-TM-AS-Result: No--5.793100-0.000000-31 X-TM-AS-MatchedID: 105630-701604-105640-863432-862883-700270-121588-188019-7 04496-702171-708712-700324-709859-121336-702143-105250-700838-700901-704156 -860092-148004-148036-42000-42003 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-MT-CheckInternalSenderRule: True X-Scanned-By: MIMEDefang 2.78 on 137.201.82.98 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170524_000054_369675_2B967E52 X-CRM114-Status: UNSURE ( 9.57 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [137.201.242.129 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 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.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peterpansjtu@gmail.com, linshunquan1@hisilicon.com, peterpandong@micron.com Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Boris Brezillon Now that the BBT code is generic, we can move it to drivers/mtd/nand/. Signed-off-by: Boris Brezillon Signed-off-by: Peter Pan --- drivers/mtd/nand/Kconfig | 3 +++ drivers/mtd/nand/Makefile | 4 ++++ drivers/mtd/nand/{raw/nand_bbt.c => bbt.c} | 5 +++++ drivers/mtd/nand/raw/Kconfig | 1 + drivers/mtd/nand/raw/Makefile | 2 +- 5 files changed, 14 insertions(+), 1 deletion(-) rename drivers/mtd/nand/{raw/nand_bbt.c => bbt.c} (99%) diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 6d53734..1c1a1f4 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -1 +1,4 @@ +config MTD_NAND_CORE + tristate + source "drivers/mtd/nand/raw/Kconfig" diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index eee2f27..fe430d9 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -1 +1,5 @@ +obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o + +nandcore-objs := bbt.o + obj-y += raw/ diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/bbt.c similarity index 99% rename from drivers/mtd/nand/raw/nand_bbt.c rename to drivers/mtd/nand/bbt.c index 26f5c3f..56115d5 100644 --- a/drivers/mtd/nand/raw/nand_bbt.c +++ b/drivers/mtd/nand/bbt.c @@ -1308,6 +1308,7 @@ int nand_scan_bbt(struct nand_device *this) this->bbt.bbt = NULL; return res; } +EXPORT_SYMBOL_GPL(nand_scan_bbt); /** * nand_release_bbt - release bad block table(s) @@ -1372,6 +1373,7 @@ int nand_update_bbt(struct nand_device *this, loff_t offs) kfree(buf); return res; } +EXPORT_SYMBOL_GPL(nand_update_bbt); /** * nand_isreserved_bbt - [NAND Interface] Check if a block is reserved @@ -1385,6 +1387,7 @@ int nand_isreserved_bbt(struct nand_device *this, loff_t offs) block = nand_offs_to_eraseblock(this, offs); return bbt_get_entry(this, block) == NAND_BBT_BLOCK_RESERVED; } +EXPORT_SYMBOL_GPL(nand_isreserved_bbt); /** * nand_isbad_bbt - [NAND Interface] Check if a block is bad @@ -1412,6 +1415,7 @@ int nand_isbad_bbt(struct nand_device *this, loff_t offs, int allowbbt) } return 1; } +EXPORT_SYMBOL_GPL(nand_isbad_bbt); /** * nand_markbad_bbt - [NAND Interface] Mark a block bad in the BBT @@ -1433,3 +1437,4 @@ int nand_markbad_bbt(struct nand_device *this, loff_t offs) return ret; } +EXPORT_SYMBOL_GPL(nand_markbad_bbt); diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 0bd2319..d7c97f9 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -14,6 +14,7 @@ menuconfig MTD_NAND tristate "NAND Device Support" depends on MTD select MTD_NAND_ECC + select MTD_NAND_CORE help This enables support for accessing all type of NAND flash devices. For further information see diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index 523d5c1..e9207e3 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -60,7 +60,7 @@ obj-$(CONFIG_MTD_NAND_BRCMNAND) += brcmnand/ obj-$(CONFIG_MTD_NAND_QCOM) += qcom_nandc.o obj-$(CONFIG_MTD_NAND_MTK) += mtk_nand.o mtk_ecc.o -nand-objs := nand_base.o nand_bbt.o nand_timings.o nand_ids.o +nand-objs := nand_base.o nand_timings.o nand_ids.o nand-objs += nand_amd.o nand-objs += nand_hynix.o nand-objs += nand_macronix.o