diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/mtd/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/Makefile | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/Makefile | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/onenand/Kconfig (renamed from drivers/mtd/onenand/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/onenand/Makefile (renamed from drivers/mtd/onenand/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/onenand/generic.c (renamed from drivers/mtd/onenand/generic.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/onenand/omap2.c (renamed from drivers/mtd/onenand/omap2.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/onenand/onenand_base.c (renamed from drivers/mtd/onenand/onenand_base.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/onenand/onenand_bbt.c (renamed from drivers/mtd/onenand/onenand_bbt.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/onenand/samsung.c (renamed from drivers/mtd/onenand/samsung.c) | 0 | ||||
| -rw-r--r-- | drivers/mtd/nand/onenand/samsung.h (renamed from drivers/mtd/onenand/samsung.h) | 0 |
13 files changed, 5 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d5ebb8a1a7c2..d262f177c65b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 2a8ac6829d42..46ab7feec6b6 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -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" diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index d6f8f625e1ff..93473d215a38 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -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/ diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 1c1a1f487e20..88c7d3b4ff8b 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -1,4 +1,6 @@ config MTD_NAND_CORE tristate +source "drivers/mtd/nand/onenand/Kconfig" + source "drivers/mtd/nand/raw/Kconfig" diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index a72d3cb0f325..3f0cb87f1a57 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -3,4 +3,5 @@ nandcore-objs := core.o bbt.o obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o +obj-y += onenand/ obj-y += raw/ diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/nand/onenand/Kconfig index 9dc15748947b..9dc15748947b 100644 --- a/drivers/mtd/onenand/Kconfig +++ b/drivers/mtd/nand/onenand/Kconfig diff --git a/drivers/mtd/onenand/Makefile b/drivers/mtd/nand/onenand/Makefile index f8b624aca9cc..f8b624aca9cc 100644 --- a/drivers/mtd/onenand/Makefile +++ b/drivers/mtd/nand/onenand/Makefile diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/nand/onenand/generic.c index d5ccaf943b91..d5ccaf943b91 100644 --- a/drivers/mtd/onenand/generic.c +++ b/drivers/mtd/nand/onenand/generic.c diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/nand/onenand/omap2.c index 9c159f0dd9a6..9c159f0dd9a6 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/nand/onenand/omap2.c diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/nand/onenand/onenand_base.c index 05907b1b4098..05907b1b4098 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/nand/onenand/onenand_base.c diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/nand/onenand/onenand_bbt.c index dde20487937d..dde20487937d 100644 --- a/drivers/mtd/onenand/onenand_bbt.c +++ b/drivers/mtd/nand/onenand/onenand_bbt.c diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/nand/onenand/samsung.c index 2e9d076e445a..2e9d076e445a 100644 --- a/drivers/mtd/onenand/samsung.c +++ b/drivers/mtd/nand/onenand/samsung.c diff --git a/drivers/mtd/onenand/samsung.h b/drivers/mtd/nand/onenand/samsung.h index 9016dc0136a8..9016dc0136a8 100644 --- a/drivers/mtd/onenand/samsung.h +++ b/drivers/mtd/nand/onenand/samsung.h |