@@ -10206,7 +10206,7 @@ ONENAND FLASH DRIVER
M: Kyungmin Park <kyungmin.park@samsung.com>
L: linux-mtd@lists.infradead.org
S: Maintained
-F: drivers/mtd/onenand/
+F: drivers/mtd/nand/onenand/
F: include/linux/mtd/onenand*.h
ONSTREAM SCSI TAPE DRIVER
@@ -333,8 +333,6 @@ source "drivers/mtd/devices/Kconfig"
source "drivers/mtd/nand/Kconfig"
-source "drivers/mtd/onenand/Kconfig"
-
source "drivers/mtd/lpddr/Kconfig"
source "drivers/mtd/spi-nor/Kconfig"
@@ -32,7 +32,7 @@ obj-$(CONFIG_MTD_SWAP) += mtdswap.o
nftl-objs := nftlcore.o nftlmount.o
inftl-objs := inftlcore.o inftlmount.o
-obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/
+obj-y += chips/ lpddr/ maps/ devices/ nand/ tests/
obj-$(CONFIG_MTD_SPI_NOR) += spi-nor/
obj-$(CONFIG_MTD_UBI) += ubi/
@@ -1,4 +1,6 @@
config MTD_NAND_CORE
tristate
+source "drivers/mtd/nand/onenand/Kconfig"
+
source "drivers/mtd/nand/raw/Kconfig"
@@ -3,4 +3,5 @@
nandcore-objs := core.o bbt.o
obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o
+obj-y += onenand/
obj-y += raw/
similarity index 100%
rename from drivers/mtd/onenand/Kconfig
rename to drivers/mtd/nand/onenand/Kconfig
similarity index 100%
rename from drivers/mtd/onenand/Makefile
rename to drivers/mtd/nand/onenand/Makefile
similarity index 100%
rename from drivers/mtd/onenand/generic.c
rename to drivers/mtd/nand/onenand/generic.c
similarity index 100%
rename from drivers/mtd/onenand/omap2.c
rename to drivers/mtd/nand/onenand/omap2.c
similarity index 100%
rename from drivers/mtd/onenand/onenand_base.c
rename to drivers/mtd/nand/onenand/onenand_base.c
similarity index 100%
rename from drivers/mtd/onenand/onenand_bbt.c
rename to drivers/mtd/nand/onenand/onenand_bbt.c
similarity index 100%
rename from drivers/mtd/onenand/samsung.c
rename to drivers/mtd/nand/onenand/samsung.c
similarity index 100%
rename from drivers/mtd/onenand/samsung.h
rename to drivers/mtd/nand/onenand/samsung.h
Move onenand code base to the drivers/mtd/nand directory in the hope that someday someone will patch it to use the generic NAND helpers. If it never happens, at least we'll have all NAND related support in a single directory and not spread over the drivers/mtd/ directory. Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> --- MAINTAINERS | 2 +- drivers/mtd/Kconfig | 2 -- drivers/mtd/Makefile | 2 +- drivers/mtd/nand/Kconfig | 2 ++ drivers/mtd/nand/Makefile | 1 + drivers/mtd/{ => nand}/onenand/Kconfig | 0 drivers/mtd/{ => nand}/onenand/Makefile | 0 drivers/mtd/{ => nand}/onenand/generic.c | 0 drivers/mtd/{ => nand}/onenand/omap2.c | 0 drivers/mtd/{ => nand}/onenand/onenand_base.c | 0 drivers/mtd/{ => nand}/onenand/onenand_bbt.c | 0 drivers/mtd/{ => nand}/onenand/samsung.c | 0 drivers/mtd/{ => nand}/onenand/samsung.h | 0 13 files changed, 5 insertions(+), 4 deletions(-) rename drivers/mtd/{ => nand}/onenand/Kconfig (100%) rename drivers/mtd/{ => nand}/onenand/Makefile (100%) rename drivers/mtd/{ => nand}/onenand/generic.c (100%) rename drivers/mtd/{ => nand}/onenand/omap2.c (100%) rename drivers/mtd/{ => nand}/onenand/onenand_base.c (100%) rename drivers/mtd/{ => nand}/onenand/onenand_bbt.c (100%) rename drivers/mtd/{ => nand}/onenand/samsung.c (100%) rename drivers/mtd/{ => nand}/onenand/samsung.h (100%)