[PATCH v3 06/12] mtd: nand: Move ONFI code into nand/ directory

Shivamurthy Shastri (sshivamurthy) sshivamurthy at micron.com
Mon Jun 3 05:43:32 PDT 2019


Move generic ONFI code to nand/ directory, which can be used by SPI
NAND layer.

Signed-off-by: Shivamurthy Shastri <sshivamurthy at micron.com>
---
 drivers/mtd/nand/Makefile                    | 2 +-
 drivers/mtd/nand/{raw/nand_onfi.c => onfi.c} | 1 +
 drivers/mtd/nand/raw/Makefile                | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename drivers/mtd/nand/{raw/nand_onfi.c => onfi.c} (99%)

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 7ecd80c0a66e..221945c223c3 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
-nandcore-objs := core.o bbt.o
+nandcore-objs := core.o bbt.o onfi.o
 obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o
 
 obj-y	+= onenand/
diff --git a/drivers/mtd/nand/raw/nand_onfi.c b/drivers/mtd/nand/onfi.c
similarity index 99%
rename from drivers/mtd/nand/raw/nand_onfi.c
rename to drivers/mtd/nand/onfi.c
index 05592f815949..fad03bb4b1ea 100644
--- a/drivers/mtd/nand/raw/nand_onfi.c
+++ b/drivers/mtd/nand/onfi.c
@@ -177,3 +177,4 @@ int nand_onfi_detect(struct nand_device *base)
 
 	return ret;
 }
+EXPORT_SYMBOL_GPL(nand_onfi_detect);
diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile
index ff7f90e9d417..9045336019d5 100644
--- a/drivers/mtd/nand/raw/Makefile
+++ b/drivers/mtd/nand/raw/Makefile
@@ -60,7 +60,6 @@ obj-$(CONFIG_MTD_NAND_STM32_FMC2)	+= stm32_fmc2_nand.o
 obj-$(CONFIG_MTD_NAND_MESON)		+= meson_nand.o
 
 nand-objs := nand_base.o nand_legacy.o nand_bbt.o nand_timings.o nand_ids.o
-nand-objs += nand_onfi.o
 nand-objs += nand_jedec.o
 nand-objs += nand_amd.o
 nand-objs += nand_esmt.o
-- 
2.17.1




More information about the linux-mtd mailing list