mtd: nand: move raw NAND related code to the raw/ subdir

As part of the process of sharing more code between different NAND
based devices, we need to move all raw NAND related code to the raw/
subdirectory.

Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>

98 files changed, 669 insertions, 665 deletions

diff --git a/Documentation/arm/Samsung-S3C24XX/S3C2412.txt b/Documentation/arm/Samsung-S3C24XX/S3C2412.txt
index f057876b920b..dc1fd362d3c1 100644
--- a/Documentation/arm/Samsung-S3C24XX/S3C2412.txt
+++ b/Documentation/arm/Samsung-S3C24XX/S3C2412.txt
@@ -46,7 +46,7 @@ NAND
 ----
 
   The NAND hardware is similar to the S3C2440, and is supported by the
-  s3c2410 driver in the drivers/mtd/nand directory.
+  s3c2410 driver in the drivers/mtd/nand/raw directory.
 
 
 USB Host
diff --git a/Documentation/driver-api/mtdnand.rst b/Documentation/driver-api/mtdnand.rst
index 2a5191b6d445..dcd63599f700 100644
--- a/Documentation/driver-api/mtdnand.rst
+++ b/Documentation/driver-api/mtdnand.rst
@@ -967,10 +967,10 @@ API functions which are exported. Each function has a short description
 which is marked with an [XXX] identifier. See the chapter "Documentation
 hints" for an explanation.
 
-.. kernel-doc:: drivers/mtd/nand/nand_base.c
+.. kernel-doc:: drivers/mtd/nand/raw/nand_base.c
    :export:
 
-.. kernel-doc:: drivers/mtd/nand/nand_ecc.c
+.. kernel-doc:: drivers/mtd/nand/raw/nand_ecc.c
    :export:
 
 Internal Functions Provided
@@ -982,10 +982,10 @@ marked with an [XXX] identifier. See the chapter "Documentation hints"
 for an explanation. The functions marked with [DEFAULT] might be
 relevant for a board driver developer.
 
-.. kernel-doc:: drivers/mtd/nand/nand_base.c
+.. kernel-doc:: drivers/mtd/nand/raw/nand_base.c
    :internal:
 
-.. kernel-doc:: drivers/mtd/nand/nand_bbt.c
+.. kernel-doc:: drivers/mtd/nand/raw/nand_bbt.c
    :internal:
 
 Credits
diff --git a/Documentation/gpio/drivers-on-gpio.txt b/Documentation/gpio/drivers-on-gpio.txt
index a2ccbab12eb7..a3e612f55bc7 100644
--- a/Documentation/gpio/drivers-on-gpio.txt
+++ b/Documentation/gpio/drivers-on-gpio.txt
@@ -74,8 +74,8 @@ hardware descriptions such as device tree or ACPI:
   it from 1-to-0-to-1. If that hardware does not receive its "ping"
   periodically, it will reset the system.
 
-- gpio-nand: drivers/mtd/nand/gpio.c is used to connect a NAND flash chip to
-  a set of simple GPIO lines: RDY, NCE, ALE, CLE, NWP. It interacts with the
+- gpio-nand: drivers/mtd/nand/raw/gpio.c is used to connect a NAND flash chip
+  to a set of simple GPIO lines: RDY, NCE, ALE, CLE, NWP. It interacts with the
   NAND flash MTD subsystem and provides chip access and partition parsing like
   any other NAND driving hardware.
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 3bdc260e36b7..34b2e9ed6d3d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1710,7 +1710,7 @@ F:	drivers/input/keyboard/w90p910_keypad.c
 F:      drivers/input/touchscreen/w90p910_ts.c
 F:      drivers/watchdog/nuc900_wdt.c
 F:      drivers/net/ethernet/nuvoton/w90p910_ether.c
-F:      drivers/mtd/nand/nuc900_nand.c
+F:      drivers/mtd/nand/raw/nuc900_nand.c
 F:      drivers/rtc/rtc-nuc900.c
 F:      drivers/spi/spi-nuc900.c
 F:      drivers/usb/host/ehci-w90x900.c
@@ -3014,7 +3014,7 @@ M:	Kamal Dasu <kdasu.kdev@gmail.com>
 L:      linux-mtd@lists.infradead.org
 L:      bcm-kernel-feedback-list@broadcom.com
 S:      Maintained
-F:      drivers/mtd/nand/brcmnand/
+F:      drivers/mtd/nand/raw/brcmnand/
 
 BROADCOM STB DPFE DRIVER
 M:      Markus Mayer <mmayer@broadcom.com>
@@ -4116,7 +4116,7 @@ DENALI NAND DRIVER
 M:      Masahiro Yamada <yamada.masahiro@socionext.com>
 L:      linux-mtd@lists.infradead.org
 S:      Supported
-F:      drivers/mtd/nand/denali*
+F:      drivers/mtd/nand/raw/denali*
 
 DESIGNWARE USB2 DRD IP DRIVER
 M:      John Youn <johnyoun@synopsys.com>
@@ -5646,7 +5646,7 @@ FREESCALE GPMI NAND DRIVER
 M:      Han Xu <han.xu@nxp.com>
 L:      linux-mtd@lists.infradead.org
 S:      Maintained
-F:      drivers/mtd/nand/gpmi-nand/*
+F:      drivers/mtd/nand/raw/gpmi-nand/*
 
 FREESCALE I2C CPM DRIVER
 M:      Jochen Friedrich <jochen@scram.de>
@@ -6955,7 +6955,7 @@ INGENIC JZ4780 NAND DRIVER
 M:      Harvey Hunt <harveyhuntnexus@gmail.com>
 L:      linux-mtd@lists.infradead.org
 S:      Maintained
-F:      drivers/mtd/nand/jz4780_*
+F:      drivers/mtd/nand/raw/jz4780_*
 
 INOTIFY
 M:      Jan Kara <jack@suse.cz>
@@ -8474,7 +8474,7 @@ MARVELL NAND CONTROLLER DRIVER
 M:      Miquel Raynal <miquel.raynal@free-electrons.com>
 L:      linux-mtd@lists.infradead.org
 S:      Maintained
-F:      drivers/mtd/nand/marvell_nand.c
+F:      drivers/mtd/nand/raw/marvell_nand.c
 F:      Documentation/devicetree/bindings/mtd/marvell-nand.txt
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@ -9136,7 +9136,7 @@ M:	Wenyou Yang <wenyou.yang@microchip.com>
 M:      Josh Wu <rainyfeeling@outlook.com>
 L:      linux-mtd@lists.infradead.org
 S:      Supported
-F:      drivers/mtd/nand/atmel/*
+F:      drivers/mtd/nand/raw/atmel/*
 F:      Documentation/devicetree/bindings/mtd/atmel-nand.txt
 
 MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
@@ -11331,7 +11331,7 @@ PXA3xx NAND FLASH DRIVER
 M:      Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
 L:      linux-mtd@lists.infradead.org
 S:      Maintained
-F:      drivers/mtd/nand/pxa3xx_nand.c
+F:      drivers/mtd/nand/raw/pxa3xx_nand.c
 
 QAT DRIVER
 M:      Giovanni Cabiddu <giovanni.cabiddu@intel.com>
@@ -11815,8 +11815,8 @@ F:	drivers/memstick/host/r592.*
 RICOH SMARTMEDIA/XD DRIVER
 M:      Maxim Levitsky <maximlevitsky@gmail.com>
 S:      Maintained
-F:      drivers/mtd/nand/r852.c
-F:      drivers/mtd/nand/r852.h
+F:      drivers/mtd/nand/raw/r852.c
+F:      drivers/mtd/nand/raw/r852.h
 
 RISC-V ARCHITECTURE
 M:      Palmer Dabbelt <palmer@sifive.com>
@@ -14635,7 +14635,7 @@ VF610 NAND DRIVER
 M:      Stefan Agner <stefan@agner.ch>
 L:      linux-mtd@lists.infradead.org
 S:      Supported
-F:      drivers/mtd/nand/vf610_nfc.c
+F:      drivers/mtd/nand/raw/vf610_nfc.c
 
 VFAT/FAT/MSDOS FILESYSTEM
 M:      OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index e6b8c59f2c0d..6d5373471809 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,580 +1 @@
-config MTD_NAND_ECC
-        tristate
-
-config MTD_NAND_ECC_SMC
-        bool "NAND ECC Smart Media byte order"
-        depends on MTD_NAND_ECC
-        default n
-        help
-          Software ECC according to the Smart Media Specification.
-          The original Linux implementation had byte 0 and 1 swapped.
-
-
-menuconfig MTD_NAND
-        tristate "NAND Device Support"
-        depends on MTD
-        select MTD_NAND_ECC
-        help
-          This enables support for accessing all type of NAND flash
-          devices. For further information see
-          <http://www.linux-mtd.infradead.org/doc/nand.html>.
-
-if MTD_NAND
-
-config MTD_NAND_BCH
-        tristate
-        select BCH
-        depends on MTD_NAND_ECC_BCH
-        default MTD_NAND
-
-config MTD_NAND_ECC_BCH
-        bool "Support software BCH ECC"
-        default n
-        help
-          This enables support for software BCH error correction. Binary BCH
-          codes are more powerful and cpu intensive than traditional Hamming
-          ECC codes. They are used with NAND devices requiring more than 1 bit
-          of error correction.
-
-config MTD_SM_COMMON
-        tristate
-        default n
-
-config MTD_NAND_DENALI
-        tristate
-
-config MTD_NAND_DENALI_PCI
-        tristate "Support Denali NAND controller on Intel Moorestown"
-        select MTD_NAND_DENALI
-        depends on HAS_DMA && PCI
-        help
-          Enable the driver for NAND flash on Intel Moorestown, using the
-          Denali NAND controller core.
-
-config MTD_NAND_DENALI_DT
-        tristate "Support Denali NAND controller as a DT device"
-        select MTD_NAND_DENALI
-        depends on HAS_DMA && HAVE_CLK && OF
-        help
-          Enable the driver for NAND flash on platforms using a Denali NAND
-          controller as a DT device.
-
-config MTD_NAND_GPIO
-        tristate "GPIO assisted NAND Flash driver"
-        depends on GPIOLIB || COMPILE_TEST
-        depends on HAS_IOMEM
-        help
-          This enables a NAND flash driver where control signals are
-          connected to GPIO pins, and commands and data are communicated
-          via a memory mapped interface.
-
-config MTD_NAND_AMS_DELTA
-        tristate "NAND Flash device on Amstrad E3"
-        depends on MACH_AMS_DELTA
-        default y
-        help
-          Support for NAND flash on Amstrad E3 (Delta).
-
-config MTD_NAND_OMAP2
-        tristate "NAND Flash device on OMAP2, OMAP3, OMAP4 and Keystone"
-        depends on (ARCH_OMAP2PLUS || ARCH_KEYSTONE)
-        help
-          Support for NAND flash on Texas Instruments OMAP2, OMAP3, OMAP4
-          and Keystone platforms.
-
-config MTD_NAND_OMAP_BCH
-        depends on MTD_NAND_OMAP2
-        bool "Support hardware based BCH error correction"
-        default n
-        select BCH
-        help
-          This config enables the ELM hardware engine, which can be used to
-          locate and correct errors when using BCH ECC scheme. This offloads
-          the cpu from doing ECC error searching and correction. However some
-          legacy OMAP families like OMAP2xxx, OMAP3xxx do not have ELM engine
-          so this is optional for them.
-
-config MTD_NAND_OMAP_BCH_BUILD
-        def_tristate MTD_NAND_OMAP2 && MTD_NAND_OMAP_BCH
-
-config MTD_NAND_RICOH
-        tristate "Ricoh xD card reader"
-        default n
-        depends on PCI
-        select MTD_SM_COMMON
-        help
-          Enable support for Ricoh R5C852 xD card reader
-          You also need to enable ether
-          NAND SSFDC (SmartMedia) read only translation layer' or new
-          expermental, readwrite
-          'SmartMedia/xD new translation layer'
-
-config MTD_NAND_AU1550
-        tristate "Au1550/1200 NAND support"
-        depends on MIPS_ALCHEMY
-        help
-          This enables the driver for the NAND flash controller on the
-          AMD/Alchemy 1550 SOC.
-
-config MTD_NAND_BF5XX
-        tristate "Blackfin on-chip NAND Flash Controller driver"
-        depends on BF54x || BF52x
-        help
-          This enables the Blackfin on-chip NAND flash controller
-
-          No board specific support is done by this driver, each board
-          must advertise a platform_device for the driver to attach.
-
-          This driver can also be built as a module. If so, the module
-          will be called bf5xx-nand.
-
-config MTD_NAND_BF5XX_HWECC
-        bool "BF5XX NAND Hardware ECC"
-        default y
-        depends on MTD_NAND_BF5XX
-        help
-          Enable the use of the BF5XX's internal ECC generator when
-          using NAND.
-
-config MTD_NAND_BF5XX_BOOTROM_ECC
-        bool "Use Blackfin BootROM ECC Layout"
-        default n
-        depends on MTD_NAND_BF5XX_HWECC
-        help
-          If you wish to modify NAND pages and allow the Blackfin on-chip
-          BootROM to boot from them, say Y here.  This is only necessary
-          if you are booting U-Boot out of NAND and you wish to update
-          U-Boot from Linux' userspace.  Otherwise, you should say N here.
-
-          If unsure, say N.
-
-config MTD_NAND_S3C2410
-        tristate "NAND Flash support for Samsung S3C SoCs"
-        depends on ARCH_S3C24XX || ARCH_S3C64XX
-        help
-          This enables the NAND flash controller on the S3C24xx and S3C64xx
-          SoCs
-
-          No board specific support is done by this driver, each board
-          must advertise a platform_device for the driver to attach.
-
-config MTD_NAND_S3C2410_DEBUG
-        bool "Samsung S3C NAND driver debug"
-        depends on MTD_NAND_S3C2410
-        help
-          Enable debugging of the S3C NAND driver
-
-config MTD_NAND_NDFC
-        tristate "NDFC NanD Flash Controller"
-        depends on 4xx
-        select MTD_NAND_ECC_SMC
-        help
-         NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
-
-config MTD_NAND_S3C2410_CLKSTOP
-        bool "Samsung S3C NAND IDLE clock stop"
-        depends on MTD_NAND_S3C2410
-        default n
-        help
-          Stop the clock to the NAND controller when there is no chip
-          selected to save power. This will mean there is a small delay
-          when the is NAND chip selected or released, but will save
-          approximately 5mA of power when there is nothing happening.
-
-config MTD_NAND_TANGO
-        tristate "NAND Flash support for Tango chips"
-        depends on ARCH_TANGO || COMPILE_TEST
-        depends on HAS_DMA
-        help
-          Enables the NAND Flash controller on Tango chips.
-
-config MTD_NAND_DISKONCHIP
-        tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation)"
-        depends on HAS_IOMEM
-        select REED_SOLOMON
-        select REED_SOLOMON_DEC16
-        help
-          This is a reimplementation of M-Systems DiskOnChip 2000,
-          Millennium and Millennium Plus as a standard NAND device driver,
-          as opposed to the earlier self-contained MTD device drivers.
-          This should enable, among other things, proper JFFS2 operation on
-          these devices.
-
-config MTD_NAND_DISKONCHIP_PROBE_ADVANCED
-        bool "Advanced detection options for DiskOnChip"
-        depends on MTD_NAND_DISKONCHIP
-        help
-          This option allows you to specify nonstandard address at which to
-          probe for a DiskOnChip, or to change the detection options.  You
-          are unlikely to need any of this unless you are using LinuxBIOS.
-          Say 'N'.
-
-config MTD_NAND_DISKONCHIP_PROBE_ADDRESS
-        hex "Physical address of DiskOnChip" if MTD_NAND_DISKONCHIP_PROBE_ADVANCED
-        depends on MTD_NAND_DISKONCHIP
-        default "0"
-        ---help---
-        By default, the probe for DiskOnChip devices will look for a
-        DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.
-        This option allows you to specify a single address at which to probe
-        for the device, which is useful if you have other devices in that
-        range which get upset when they are probed.
-
-        (Note that on PowerPC, the normal probe will only check at
-        0xE4000000.)
-
-        Normally, you should leave this set to zero, to allow the probe at
-        the normal addresses.
-
-config MTD_NAND_DISKONCHIP_PROBE_HIGH
-        bool "Probe high addresses"
-        depends on MTD_NAND_DISKONCHIP_PROBE_ADVANCED
-        help
-          By default, the probe for DiskOnChip devices will look for a
-          DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.
-          This option changes to make it probe between 0xFFFC8000 and
-          0xFFFEE000.  Unless you are using LinuxBIOS, this is unlikely to be
-          useful to you.  Say 'N'.
-
-config MTD_NAND_DISKONCHIP_BBTWRITE
-        bool "Allow BBT writes on DiskOnChip Millennium and 2000TSOP"
-        depends on MTD_NAND_DISKONCHIP
-        help
-          On DiskOnChip devices shipped with the INFTL filesystem (Millennium
-          and 2000 TSOP/Alon), Linux reserves some space at the end of the
-          device for the Bad Block Table (BBT).  If you have existing INFTL
-          data on your device (created by non-Linux tools such as M-Systems'
-          DOS drivers), your data might overlap the area Linux wants to use for
-          the BBT.  If this is a concern for you, leave this option disabled and
-          Linux will not write BBT data into this area.
-          The downside of leaving this option disabled is that if bad blocks
-          are detected by Linux, they will not be recorded in the BBT, which
-          could cause future problems.
-          Once you enable this option, new filesystems (INFTL or others, created
-          in Linux or other operating systems) will not use the reserved area.
-          The only reason not to enable this option is to prevent damage to
-          preexisting filesystems.
-          Even if you leave this disabled, you can enable BBT writes at module
-          load time (assuming you build diskonchip as a module) with the module
-          parameter "inftl_bbt_write=1".
-
-config MTD_NAND_DOCG4
-        tristate "Support for DiskOnChip G4"
-        depends on HAS_IOMEM
-        select BCH
-        select BITREVERSE
-        help
-          Support for diskonchip G4 nand flash, found in various smartphones and
-          PDAs, among them the Palm Treo680, HTC Prophet and Wizard, Toshiba
-          Portege G900, Asus P526, and O2 XDA Zinc.
-
-          With this driver you will be able to use UBI and create a ubifs on the
-          device, so you may wish to consider enabling UBI and UBIFS as well.
-
-          These devices ship with the Mys/Sandisk SAFTL formatting, for which
-          there is currently no mtd parser, so you may want to use command line
-          partitioning to segregate write-protected blocks. On the Treo680, the
-          first five erase blocks (256KiB each) are write-protected, followed
-          by the block containing the saftl partition table.  This is probably
-          typical.
-
-config MTD_NAND_SHARPSL
-        tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
-        depends on ARCH_PXA
-
-config MTD_NAND_CAFE
-        tristate "NAND support for OLPC CAFÉ chip"
-        depends on PCI
-        select REED_SOLOMON
-        select REED_SOLOMON_DEC16
-        help
-          Use NAND flash attached to the CAFÉ chip designed for the OLPC
-          laptop.
-
-config MTD_NAND_CS553X
-        tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
-        depends on X86_32
-        depends on !UML && HAS_IOMEM
-        help
-          The CS553x companion chips for the AMD Geode processor
-          include NAND flash controllers with built-in hardware ECC
-          capabilities; enabling this option will allow you to use
-          these. The driver will check the MSRs to verify that the
-          controller is enabled for NAND, and currently requires that
-          the controller be in MMIO mode.
-
-          If you say "m", the module will be called cs553x_nand.
-
-config MTD_NAND_ATMEL
-        tristate "Support for NAND Flash / SmartMedia on AT91"
-        depends on ARCH_AT91
-        select MFD_ATMEL_SMC
-        help
-          Enables support for NAND Flash / Smart Media Card interface
-          on Atmel AT91 processors.
-
-config MTD_NAND_PXA3xx
-        tristate "NAND support on PXA3xx and Armada 370/XP"
-        depends on !MTD_NAND_MARVELL
-        depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU
-        help
-
-          This enables the driver for the NAND flash device found on
-          PXA3xx processors (NFCv1) and also on 32-bit Armada
-          platforms (XP, 370, 375, 38x, 39x) and 64-bit Armada
-          platforms (7K, 8K) (NFCv2).
-
-config MTD_NAND_MARVELL
-        tristate "NAND controller support on Marvell boards"
-        depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \
-                   COMPILE_TEST
-        depends on HAS_IOMEM
-        help
-          This enables the NAND flash controller driver for Marvell boards,
-          including:
-          - PXA3xx processors (NFCv1)
-          - 32-bit Armada platforms (XP, 37x, 38x, 39x) (NFCv2)
-          - 64-bit Aramda platforms (7k, 8k) (NFCv2)
-
-config MTD_NAND_SLC_LPC32XX
-        tristate "NXP LPC32xx SLC Controller"
-        depends on ARCH_LPC32XX
-        help
-          Enables support for NXP's LPC32XX SLC (i.e. for Single Level Cell
-          chips) NAND controller. This is the default for the PHYTEC 3250
-          reference board which contains a NAND256R3A2CZA6 chip.
-
-          Please check the actual NAND chip connected and its support
-          by the SLC NAND controller.
-
-config MTD_NAND_MLC_LPC32XX
-        tristate "NXP LPC32xx MLC Controller"
-        depends on ARCH_LPC32XX
-        help
-          Uses the LPC32XX MLC (i.e. for Multi Level Cell chips) NAND
-          controller. This is the default for the WORK92105 controller
-          board.
-
-          Please check the actual NAND chip connected and its support
-          by the MLC NAND controller.
-
-config MTD_NAND_CM_X270
-        tristate "Support for NAND Flash on CM-X270 modules"
-        depends on MACH_ARMCORE
-
-config MTD_NAND_PASEMI
-        tristate "NAND support for PA Semi PWRficient"
-        depends on PPC_PASEMI
-        help
-          Enables support for NAND Flash interface on PA Semi PWRficient
-          based boards
-
-config MTD_NAND_TMIO
-        tristate "NAND Flash device on Toshiba Mobile IO Controller"
-        depends on MFD_TMIO
-        help
-          Support for NAND flash connected to a Toshiba Mobile IO
-          Controller in some PDAs, including the Sharp SL6000x.
-
-config MTD_NAND_NANDSIM
-        tristate "Support for NAND Flash Simulator"
-        help
-          The simulator may simulate various NAND flash chips for the
-          MTD nand layer.
-
-config MTD_NAND_GPMI_NAND
-        tristate "GPMI NAND Flash Controller driver"
-        depends on MTD_NAND && MXS_DMA
-        help
-         Enables NAND Flash support for IMX23, IMX28 or IMX6.
-         The GPMI controller is very powerful, with the help of BCH
-         module, it can do the hardware ECC. The GPMI supports several
-         NAND flashs at the same time.
-
-config MTD_NAND_BRCMNAND
-        tristate "Broadcom STB NAND controller"
-        depends on ARM || ARM64 || MIPS
-        help
-          Enables the Broadcom NAND controller driver. The controller was
-          originally designed for Set-Top Box but is used on various BCM7xxx,
-          BCM3xxx, BCM63xxx, iProc/Cygnus and more.
-
-config MTD_NAND_BCM47XXNFLASH
-        tristate "Support for NAND flash on BCM4706 BCMA bus"
-        depends on BCMA_NFLASH
-        help
-          BCMA bus can have various flash memories attached, they are
-          registered by bcma as platform devices. This enables driver for
-          NAND flash memories. For now only BCM4706 is supported.
-
-config MTD_NAND_PLATFORM
-        tristate "Support for generic platform NAND driver"
-        depends on HAS_IOMEM
-        help
-          This implements a generic NAND driver for on-SOC platform
-          devices. You will need to provide platform-specific functions
-          via platform_data.
-
-config MTD_NAND_ORION
-        tristate "NAND Flash support for Marvell Orion SoC"
-        depends on PLAT_ORION
-        help
-          This enables the NAND flash controller on Orion machines.
-
-          No board specific support is done by this driver, each board
-          must advertise a platform_device for the driver to attach.
-
-config MTD_NAND_OXNAS
-        tristate "NAND Flash support for Oxford Semiconductor SoC"
-        depends on ARCH_OXNAS || COMPILE_TEST
-        depends on HAS_IOMEM
-        help
-          This enables the NAND flash controller on Oxford Semiconductor SoCs.
-
-config MTD_NAND_FSL_ELBC
-        tristate "NAND support for Freescale eLBC controllers"
-        depends on FSL_SOC
-        select FSL_LBC
-        help
-          Various Freescale chips, including the 8313, include a NAND Flash
-          Controller Module with built-in hardware ECC capabilities.
-          Enabling this option will enable you to use this to control
-          external NAND devices.
-
-config MTD_NAND_FSL_IFC
-        tristate "NAND support for Freescale IFC controller"
-        depends on FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A
-        select FSL_IFC
-        select MEMORY
-        help
-          Various Freescale chips e.g P1010, include a NAND Flash machine
-          with built-in hardware ECC capabilities.
-          Enabling this option will enable you to use this to control
-          external NAND devices.
-
-config MTD_NAND_FSL_UPM
-        tristate "Support for NAND on Freescale UPM"
-        depends on PPC_83xx || PPC_85xx
-        select FSL_LBC
-        help
-          Enables support for NAND Flash chips wired onto Freescale PowerPC
-          processor localbus with User-Programmable Machine support.
-
-config MTD_NAND_MPC5121_NFC
-        tristate "MPC5121 built-in NAND Flash Controller support"
-        depends on PPC_MPC512x
-        help
-          This enables the driver for the NAND flash controller on the
-          MPC5121 SoC.
-
-config MTD_NAND_VF610_NFC
-        tristate "Support for Freescale NFC for VF610/MPC5125"
-        depends on (SOC_VF610 || COMPILE_TEST)
-        depends on HAS_IOMEM
-        help
-          Enables support for NAND Flash Controller on some Freescale
-          processors like the VF610, MPC5125, MCF54418 or Kinetis K70.
-          The driver supports a maximum 2k page size. With 2k pages and
-          64 bytes or more of OOB, hardware ECC with up to 32-bit error
-          correction is supported. Hardware ECC is only enabled through
-          device tree.
-
-config MTD_NAND_MXC
-        tristate "MXC NAND support"
-        depends on ARCH_MXC
-        help
-          This enables the driver for the NAND flash controller on the
-          MXC processors.
-
-config MTD_NAND_SH_FLCTL
-        tristate "Support for NAND on Renesas SuperH FLCTL"
-        depends on SUPERH || COMPILE_TEST
-        depends on HAS_IOMEM
-        depends on HAS_DMA
-        help
-          Several Renesas SuperH CPU has FLCTL. This option enables support
-          for NAND Flash using FLCTL.
-
-config MTD_NAND_DAVINCI
-        tristate "Support NAND on DaVinci/Keystone SoC"
-        depends on ARCH_DAVINCI || (ARCH_KEYSTONE && TI_AEMIF)
-        help
-          Enable the driver for NAND flash chips on Texas Instruments
-          DaVinci/Keystone processors.
-
-config MTD_NAND_TXX9NDFMC
-        tristate "NAND Flash support for TXx9 SoC"
-        depends on SOC_TX4938 || SOC_TX4939
-        help
-          This enables the NAND flash controller on the TXx9 SoCs.
-
-config MTD_NAND_SOCRATES
-        tristate "Support for NAND on Socrates board"
-        depends on SOCRATES
-        help
-          Enables support for NAND Flash chips wired onto Socrates board.
-
-config MTD_NAND_NUC900
-        tristate "Support for NAND on Nuvoton NUC9xx/w90p910 evaluation boards."
-        depends on ARCH_W90X900
-        help
-          This enables the driver for the NAND Flash on evaluation board based
-          on w90p910 / NUC9xx.
-
-config MTD_NAND_JZ4740
-        tristate "Support for JZ4740 SoC NAND controller"
-        depends on MACH_JZ4740
-        help
-                Enables support for NAND Flash on JZ4740 SoC based boards.
-
-config MTD_NAND_JZ4780
-        tristate "Support for NAND on JZ4780 SoC"
-        depends on MACH_JZ4780 && JZ4780_NEMC
-        help
-          Enables support for NAND Flash connected to the NEMC on JZ4780 SoC
-          based boards, using the BCH controller for hardware error correction.
-
-config MTD_NAND_FSMC
-        tristate "Support for NAND on ST Micros FSMC"
-        depends on OF
-        depends on PLAT_SPEAR || ARCH_NOMADIK || ARCH_U8500 || MACH_U300
-        help
-          Enables support for NAND Flash chips on the ST Microelectronics
-          Flexible Static Memory Controller (FSMC)
-
-config MTD_NAND_XWAY
-        bool "Support for NAND on Lantiq XWAY SoC"
-        depends on LANTIQ && SOC_TYPE_XWAY
-        help
-          Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached
-          to the External Bus Unit (EBU).
-
-config MTD_NAND_SUNXI
-        tristate "Support for NAND on Allwinner SoCs"
-        depends on ARCH_SUNXI
-        help
-          Enables support for NAND Flash chips on Allwinner SoCs.
-
-config MTD_NAND_HISI504
-        tristate "Support for NAND controller on Hisilicon SoC Hip04"
-        depends on ARCH_HISI || COMPILE_TEST
-        depends on HAS_DMA
-        help
-          Enables support for NAND controller on Hisilicon SoC Hip04.
-
-config MTD_NAND_QCOM
-        tristate "Support for NAND on QCOM SoCs"
-        depends on ARCH_QCOM
-        help
-          Enables support for NAND flash chips on SoCs containing the EBI2 NAND
-          controller. This controller is found on IPQ806x SoC.
-
-config MTD_NAND_MTK
-        tristate "Support for NAND controller on MTK SoCs"
-        depends on ARCH_MEDIATEK || COMPILE_TEST
-        depends on HAS_DMA
-        help
-          Enables support for NAND controller on MTK SoCs.
-          This controller is found on mt27xx, mt81xx, mt65xx SoCs.
-
-endif # MTD_NAND
+source "drivers/mtd/nand/raw/Kconfig"
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 4e0982476267..32af7168c5ba 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -1,68 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
 
-obj-$(CONFIG_MTD_NAND)                  += nand.o
-obj-$(CONFIG_MTD_NAND_ECC)              += nand_ecc.o
-obj-$(CONFIG_MTD_NAND_BCH)              += nand_bch.o
-obj-$(CONFIG_MTD_SM_COMMON)             += sm_common.o
-
-obj-$(CONFIG_MTD_NAND_CAFE)             += cafe_nand.o
-obj-$(CONFIG_MTD_NAND_AMS_DELTA)        += ams-delta.o
-obj-$(CONFIG_MTD_NAND_DENALI)           += denali.o
-obj-$(CONFIG_MTD_NAND_DENALI_PCI)       += denali_pci.o
-obj-$(CONFIG_MTD_NAND_DENALI_DT)        += denali_dt.o
-obj-$(CONFIG_MTD_NAND_AU1550)           += au1550nd.o
-obj-$(CONFIG_MTD_NAND_BF5XX)            += bf5xx_nand.o
-obj-$(CONFIG_MTD_NAND_S3C2410)          += s3c2410.o
-obj-$(CONFIG_MTD_NAND_TANGO)            += tango_nand.o
-obj-$(CONFIG_MTD_NAND_DAVINCI)          += davinci_nand.o
-obj-$(CONFIG_MTD_NAND_DISKONCHIP)       += diskonchip.o
-obj-$(CONFIG_MTD_NAND_DOCG4)            += docg4.o
-obj-$(CONFIG_MTD_NAND_FSMC)             += fsmc_nand.o
-obj-$(CONFIG_MTD_NAND_SHARPSL)          += sharpsl.o
-obj-$(CONFIG_MTD_NAND_NANDSIM)          += nandsim.o
-obj-$(CONFIG_MTD_NAND_CS553X)           += cs553x_nand.o
-obj-$(CONFIG_MTD_NAND_NDFC)             += ndfc.o
-obj-$(CONFIG_MTD_NAND_ATMEL)            += atmel/
-obj-$(CONFIG_MTD_NAND_GPIO)             += gpio.o
-omap2_nand-objs := omap2.o
-obj-$(CONFIG_MTD_NAND_OMAP2)            += omap2_nand.o
-obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD)   += omap_elm.o
-obj-$(CONFIG_MTD_NAND_CM_X270)          += cmx270_nand.o
-obj-$(CONFIG_MTD_NAND_PXA3xx)           += pxa3xx_nand.o
-obj-$(CONFIG_MTD_NAND_MARVELL)          += marvell_nand.o
-obj-$(CONFIG_MTD_NAND_TMIO)             += tmio_nand.o
-obj-$(CONFIG_MTD_NAND_PLATFORM)         += plat_nand.o
-obj-$(CONFIG_MTD_NAND_PASEMI)           += pasemi_nand.o
-obj-$(CONFIG_MTD_NAND_ORION)            += orion_nand.o
-obj-$(CONFIG_MTD_NAND_OXNAS)            += oxnas_nand.o
-obj-$(CONFIG_MTD_NAND_FSL_ELBC)         += fsl_elbc_nand.o
-obj-$(CONFIG_MTD_NAND_FSL_IFC)          += fsl_ifc_nand.o
-obj-$(CONFIG_MTD_NAND_FSL_UPM)          += fsl_upm.o
-obj-$(CONFIG_MTD_NAND_SLC_LPC32XX)      += lpc32xx_slc.o
-obj-$(CONFIG_MTD_NAND_MLC_LPC32XX)      += lpc32xx_mlc.o
-obj-$(CONFIG_MTD_NAND_SH_FLCTL)         += sh_flctl.o
-obj-$(CONFIG_MTD_NAND_MXC)              += mxc_nand.o
-obj-$(CONFIG_MTD_NAND_SOCRATES)         += socrates_nand.o
-obj-$(CONFIG_MTD_NAND_TXX9NDFMC)        += txx9ndfmc.o
-obj-$(CONFIG_MTD_NAND_NUC900)           += nuc900_nand.o
-obj-$(CONFIG_MTD_NAND_MPC5121_NFC)      += mpc5121_nfc.o
-obj-$(CONFIG_MTD_NAND_VF610_NFC)        += vf610_nfc.o
-obj-$(CONFIG_MTD_NAND_RICOH)            += r852.o
-obj-$(CONFIG_MTD_NAND_JZ4740)           += jz4740_nand.o
-obj-$(CONFIG_MTD_NAND_JZ4780)           += jz4780_nand.o jz4780_bch.o
-obj-$(CONFIG_MTD_NAND_GPMI_NAND)        += gpmi-nand/
-obj-$(CONFIG_MTD_NAND_XWAY)             += xway_nand.o
-obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH)    += bcm47xxnflash/
-obj-$(CONFIG_MTD_NAND_SUNXI)            += sunxi_nand.o
-obj-$(CONFIG_MTD_NAND_HISI504)          += hisi504_nand.o
-obj-$(CONFIG_MTD_NAND_BRCMNAND)         += brcmnand/
-obj-$(CONFIG_MTD_NAND_QCOM)             += qcom_nandc.o
-obj-$(CONFIG_MTD_NAND_MTK)              += mtk_ecc.o mtk_nand.o
-
-nand-objs := nand_base.o nand_bbt.o nand_timings.o nand_ids.o
-nand-objs += nand_amd.o
-nand-objs += nand_hynix.o
-nand-objs += nand_macronix.o
-nand-objs += nand_micron.o
-nand-objs += nand_samsung.o
-nand-objs += nand_toshiba.o
+obj-y   += raw/
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
new file mode 100644
index 000000000000..e6b8c59f2c0d
--- /dev/null
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -0,0 +1,580 @@
+config MTD_NAND_ECC
+        tristate
+
+config MTD_NAND_ECC_SMC
+        bool "NAND ECC Smart Media byte order"
+        depends on MTD_NAND_ECC
+        default n
+        help
+          Software ECC according to the Smart Media Specification.
+          The original Linux implementation had byte 0 and 1 swapped.
+
+
+menuconfig MTD_NAND
+        tristate "NAND Device Support"
+        depends on MTD
+        select MTD_NAND_ECC
+        help
+          This enables support for accessing all type of NAND flash
+          devices. For further information see
+          <http://www.linux-mtd.infradead.org/doc/nand.html>.
+
+if MTD_NAND
+
+config MTD_NAND_BCH
+        tristate
+        select BCH
+        depends on MTD_NAND_ECC_BCH
+        default MTD_NAND
+
+config MTD_NAND_ECC_BCH
+        bool "Support software BCH ECC"
+        default n
+        help
+          This enables support for software BCH error correction. Binary BCH
+          codes are more powerful and cpu intensive than traditional Hamming
+          ECC codes. They are used with NAND devices requiring more than 1 bit
+          of error correction.
+
+config MTD_SM_COMMON
+        tristate
+        default n
+
+config MTD_NAND_DENALI
+        tristate
+
+config MTD_NAND_DENALI_PCI
+        tristate "Support Denali NAND controller on Intel Moorestown"
+        select MTD_NAND_DENALI
+        depends on HAS_DMA && PCI
+        help
+          Enable the driver for NAND flash on Intel Moorestown, using the
+          Denali NAND controller core.
+
+config MTD_NAND_DENALI_DT
+        tristate "Support Denali NAND controller as a DT device"
+        select MTD_NAND_DENALI
+        depends on HAS_DMA && HAVE_CLK && OF
+        help
+          Enable the driver for NAND flash on platforms using a Denali NAND
+          controller as a DT device.
+
+config MTD_NAND_GPIO
+        tristate "GPIO assisted NAND Flash driver"
+        depends on GPIOLIB || COMPILE_TEST
+        depends on HAS_IOMEM
+        help
+          This enables a NAND flash driver where control signals are
+          connected to GPIO pins, and commands and data are communicated
+          via a memory mapped interface.
+
+config MTD_NAND_AMS_DELTA
+        tristate "NAND Flash device on Amstrad E3"
+        depends on MACH_AMS_DELTA
+        default y
+        help
+          Support for NAND flash on Amstrad E3 (Delta).
+
+config MTD_NAND_OMAP2
+        tristate "NAND Flash device on OMAP2, OMAP3, OMAP4 and Keystone"
+        depends on (ARCH_OMAP2PLUS || ARCH_KEYSTONE)
+        help
+          Support for NAND flash on Texas Instruments OMAP2, OMAP3, OMAP4
+          and Keystone platforms.
+
+config MTD_NAND_OMAP_BCH
+        depends on MTD_NAND_OMAP2
+        bool "Support hardware based BCH error correction"
+        default n
+        select BCH
+        help
+          This config enables the ELM hardware engine, which can be used to
+          locate and correct errors when using BCH ECC scheme. This offloads
+          the cpu from doing ECC error searching and correction. However some
+          legacy OMAP families like OMAP2xxx, OMAP3xxx do not have ELM engine
+          so this is optional for them.
+
+config MTD_NAND_OMAP_BCH_BUILD
+        def_tristate MTD_NAND_OMAP2 && MTD_NAND_OMAP_BCH
+
+config MTD_NAND_RICOH
+        tristate "Ricoh xD card reader"
+        default n
+        depends on PCI
+        select MTD_SM_COMMON
+        help
+          Enable support for Ricoh R5C852 xD card reader
+          You also need to enable ether
+          NAND SSFDC (SmartMedia) read only translation layer' or new
+          expermental, readwrite
+          'SmartMedia/xD new translation layer'
+
+config MTD_NAND_AU1550
+        tristate "Au1550/1200 NAND support"
+        depends on MIPS_ALCHEMY
+        help
+          This enables the driver for the NAND flash controller on the
+          AMD/Alchemy 1550 SOC.
+
+config MTD_NAND_BF5XX
+        tristate "Blackfin on-chip NAND Flash Controller driver"
+        depends on BF54x || BF52x
+        help
+          This enables the Blackfin on-chip NAND flash controller
+
+          No board specific support is done by this driver, each board
+          must advertise a platform_device for the driver to attach.
+
+          This driver can also be built as a module. If so, the module
+          will be called bf5xx-nand.
+
+config MTD_NAND_BF5XX_HWECC
+        bool "BF5XX NAND Hardware ECC"
+        default y
+        depends on MTD_NAND_BF5XX
+        help
+          Enable the use of the BF5XX's internal ECC generator when
+          using NAND.
+
+config MTD_NAND_BF5XX_BOOTROM_ECC
+        bool "Use Blackfin BootROM ECC Layout"
+        default n
+        depends on MTD_NAND_BF5XX_HWECC
+        help
+          If you wish to modify NAND pages and allow the Blackfin on-chip
+          BootROM to boot from them, say Y here.  This is only necessary
+          if you are booting U-Boot out of NAND and you wish to update
+          U-Boot from Linux' userspace.  Otherwise, you should say N here.
+
+          If unsure, say N.
+
+config MTD_NAND_S3C2410
+        tristate "NAND Flash support for Samsung S3C SoCs"
+        depends on ARCH_S3C24XX || ARCH_S3C64XX
+        help
+          This enables the NAND flash controller on the S3C24xx and S3C64xx
+          SoCs
+
+          No board specific support is done by this driver, each board
+          must advertise a platform_device for the driver to attach.
+
+config MTD_NAND_S3C2410_DEBUG
+        bool "Samsung S3C NAND driver debug"
+        depends on MTD_NAND_S3C2410
+        help
+          Enable debugging of the S3C NAND driver
+
+config MTD_NAND_NDFC
+        tristate "NDFC NanD Flash Controller"
+        depends on 4xx
+        select MTD_NAND_ECC_SMC
+        help
+         NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
+
+config MTD_NAND_S3C2410_CLKSTOP
+        bool "Samsung S3C NAND IDLE clock stop"
+        depends on MTD_NAND_S3C2410
+        default n
+        help
+          Stop the clock to the NAND controller when there is no chip
+          selected to save power. This will mean there is a small delay
+          when the is NAND chip selected or released, but will save
+          approximately 5mA of power when there is nothing happening.
+
+config MTD_NAND_TANGO
+        tristate "NAND Flash support for Tango chips"
+        depends on ARCH_TANGO || COMPILE_TEST
+        depends on HAS_DMA
+        help
+          Enables the NAND Flash controller on Tango chips.
+
+config MTD_NAND_DISKONCHIP
+        tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation)"
+        depends on HAS_IOMEM
+        select REED_SOLOMON
+        select REED_SOLOMON_DEC16
+        help
+          This is a reimplementation of M-Systems DiskOnChip 2000,
+          Millennium and Millennium Plus as a standard NAND device driver,
+          as opposed to the earlier self-contained MTD device drivers.
+          This should enable, among other things, proper JFFS2 operation on
+          these devices.
+
+config MTD_NAND_DISKONCHIP_PROBE_ADVANCED
+        bool "Advanced detection options for DiskOnChip"
+        depends on MTD_NAND_DISKONCHIP
+        help
+          This option allows you to specify nonstandard address at which to
+          probe for a DiskOnChip, or to change the detection options.  You
+          are unlikely to need any of this unless you are using LinuxBIOS.
+          Say 'N'.
+
+config MTD_NAND_DISKONCHIP_PROBE_ADDRESS
+        hex "Physical address of DiskOnChip" if MTD_NAND_DISKONCHIP_PROBE_ADVANCED
+        depends on MTD_NAND_DISKONCHIP
+        default "0"
+        ---help---
+        By default, the probe for DiskOnChip devices will look for a
+        DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.
+        This option allows you to specify a single address at which to probe
+        for the device, which is useful if you have other devices in that
+        range which get upset when they are probed.
+
+        (Note that on PowerPC, the normal probe will only check at
+        0xE4000000.)
+
+        Normally, you should leave this set to zero, to allow the probe at
+        the normal addresses.
+
+config MTD_NAND_DISKONCHIP_PROBE_HIGH
+        bool "Probe high addresses"
+        depends on MTD_NAND_DISKONCHIP_PROBE_ADVANCED
+        help
+          By default, the probe for DiskOnChip devices will look for a
+          DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.
+          This option changes to make it probe between 0xFFFC8000 and
+          0xFFFEE000.  Unless you are using LinuxBIOS, this is unlikely to be
+          useful to you.  Say 'N'.
+
+config MTD_NAND_DISKONCHIP_BBTWRITE
+        bool "Allow BBT writes on DiskOnChip Millennium and 2000TSOP"
+        depends on MTD_NAND_DISKONCHIP
+        help
+          On DiskOnChip devices shipped with the INFTL filesystem (Millennium
+          and 2000 TSOP/Alon), Linux reserves some space at the end of the
+          device for the Bad Block Table (BBT).  If you have existing INFTL
+          data on your device (created by non-Linux tools such as M-Systems'
+          DOS drivers), your data might overlap the area Linux wants to use for
+          the BBT.  If this is a concern for you, leave this option disabled and
+          Linux will not write BBT data into this area.
+          The downside of leaving this option disabled is that if bad blocks
+          are detected by Linux, they will not be recorded in the BBT, which
+          could cause future problems.
+          Once you enable this option, new filesystems (INFTL or others, created
+          in Linux or other operating systems) will not use the reserved area.
+          The only reason not to enable this option is to prevent damage to
+          preexisting filesystems.
+          Even if you leave this disabled, you can enable BBT writes at module
+          load time (assuming you build diskonchip as a module) with the module
+          parameter "inftl_bbt_write=1".
+
+config MTD_NAND_DOCG4
+        tristate "Support for DiskOnChip G4"
+        depends on HAS_IOMEM
+        select BCH
+        select BITREVERSE
+        help
+          Support for diskonchip G4 nand flash, found in various smartphones and
+          PDAs, among them the Palm Treo680, HTC Prophet and Wizard, Toshiba
+          Portege G900, Asus P526, and O2 XDA Zinc.
+
+          With this driver you will be able to use UBI and create a ubifs on the
+          device, so you may wish to consider enabling UBI and UBIFS as well.
+
+          These devices ship with the Mys/Sandisk SAFTL formatting, for which
+          there is currently no mtd parser, so you may want to use command line
+          partitioning to segregate write-protected blocks. On the Treo680, the
+          first five erase blocks (256KiB each) are write-protected, followed
+          by the block containing the saftl partition table.  This is probably
+          typical.
+
+config MTD_NAND_SHARPSL
+        tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
+        depends on ARCH_PXA
+
+config MTD_NAND_CAFE
+        tristate "NAND support for OLPC CAFÉ chip"
+        depends on PCI
+        select REED_SOLOMON
+        select REED_SOLOMON_DEC16
+        help
+          Use NAND flash attached to the CAFÉ chip designed for the OLPC
+          laptop.
+
+config MTD_NAND_CS553X
+        tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
+        depends on X86_32
+        depends on !UML && HAS_IOMEM
+        help
+          The CS553x companion chips for the AMD Geode processor
+          include NAND flash controllers with built-in hardware ECC
+          capabilities; enabling this option will allow you to use
+          these. The driver will check the MSRs to verify that the
+          controller is enabled for NAND, and currently requires that
+          the controller be in MMIO mode.
+
+          If you say "m", the module will be called cs553x_nand.
+
+config MTD_NAND_ATMEL
+        tristate "Support for NAND Flash / SmartMedia on AT91"
+        depends on ARCH_AT91
+        select MFD_ATMEL_SMC
+        help
+          Enables support for NAND Flash / Smart Media Card interface
+          on Atmel AT91 processors.
+
+config MTD_NAND_PXA3xx
+        tristate "NAND support on PXA3xx and Armada 370/XP"
+        depends on !MTD_NAND_MARVELL
+        depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU
+        help
+
+          This enables the driver for the NAND flash device found on
+          PXA3xx processors (NFCv1) and also on 32-bit Armada
+          platforms (XP, 370, 375, 38x, 39x) and 64-bit Armada
+          platforms (7K, 8K) (NFCv2).
+
+config MTD_NAND_MARVELL
+        tristate "NAND controller support on Marvell boards"
+        depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \
+                   COMPILE_TEST
+        depends on HAS_IOMEM
+        help
+          This enables the NAND flash controller driver for Marvell boards,
+          including:
+          - PXA3xx processors (NFCv1)
+          - 32-bit Armada platforms (XP, 37x, 38x, 39x) (NFCv2)
+          - 64-bit Aramda platforms (7k, 8k) (NFCv2)
+
+config MTD_NAND_SLC_LPC32XX
+        tristate "NXP LPC32xx SLC Controller"
+        depends on ARCH_LPC32XX
+        help
+          Enables support for NXP's LPC32XX SLC (i.e. for Single Level Cell
+          chips) NAND controller. This is the default for the PHYTEC 3250
+          reference board which contains a NAND256R3A2CZA6 chip.
+
+          Please check the actual NAND chip connected and its support
+          by the SLC NAND controller.
+
+config MTD_NAND_MLC_LPC32XX
+        tristate "NXP LPC32xx MLC Controller"
+        depends on ARCH_LPC32XX
+        help
+          Uses the LPC32XX MLC (i.e. for Multi Level Cell chips) NAND
+          controller. This is the default for the WORK92105 controller
+          board.
+
+          Please check the actual NAND chip connected and its support
+          by the MLC NAND controller.
+
+config MTD_NAND_CM_X270
+        tristate "Support for NAND Flash on CM-X270 modules"
+        depends on MACH_ARMCORE
+
+config MTD_NAND_PASEMI
+        tristate "NAND support for PA Semi PWRficient"
+        depends on PPC_PASEMI
+        help
+          Enables support for NAND Flash interface on PA Semi PWRficient
+          based boards
+
+config MTD_NAND_TMIO
+        tristate "NAND Flash device on Toshiba Mobile IO Controller"
+        depends on MFD_TMIO
+        help
+          Support for NAND flash connected to a Toshiba Mobile IO
+          Controller in some PDAs, including the Sharp SL6000x.
+
+config MTD_NAND_NANDSIM
+        tristate "Support for NAND Flash Simulator"
+        help
+          The simulator may simulate various NAND flash chips for the
+          MTD nand layer.
+
+config MTD_NAND_GPMI_NAND
+        tristate "GPMI NAND Flash Controller driver"
+        depends on MTD_NAND && MXS_DMA
+        help
+         Enables NAND Flash support for IMX23, IMX28 or IMX6.
+         The GPMI controller is very powerful, with the help of BCH
+         module, it can do the hardware ECC. The GPMI supports several
+         NAND flashs at the same time.
+
+config MTD_NAND_BRCMNAND
+        tristate "Broadcom STB NAND controller"
+        depends on ARM || ARM64 || MIPS
+        help
+          Enables the Broadcom NAND controller driver. The controller was
+          originally designed for Set-Top Box but is used on various BCM7xxx,
+          BCM3xxx, BCM63xxx, iProc/Cygnus and more.
+
+config MTD_NAND_BCM47XXNFLASH
+        tristate "Support for NAND flash on BCM4706 BCMA bus"
+        depends on BCMA_NFLASH
+        help
+          BCMA bus can have various flash memories attached, they are
+          registered by bcma as platform devices. This enables driver for
+          NAND flash memories. For now only BCM4706 is supported.
+
+config MTD_NAND_PLATFORM
+        tristate "Support for generic platform NAND driver"
+        depends on HAS_IOMEM
+        help
+          This implements a generic NAND driver for on-SOC platform
+          devices. You will need to provide platform-specific functions
+          via platform_data.
+
+config MTD_NAND_ORION
+        tristate "NAND Flash support for Marvell Orion SoC"
+        depends on PLAT_ORION
+        help
+          This enables the NAND flash controller on Orion machines.
+
+          No board specific support is done by this driver, each board
+          must advertise a platform_device for the driver to attach.
+
+config MTD_NAND_OXNAS
+        tristate "NAND Flash support for Oxford Semiconductor SoC"
+        depends on ARCH_OXNAS || COMPILE_TEST
+        depends on HAS_IOMEM
+        help
+          This enables the NAND flash controller on Oxford Semiconductor SoCs.
+
+config MTD_NAND_FSL_ELBC
+        tristate "NAND support for Freescale eLBC controllers"
+        depends on FSL_SOC
+        select FSL_LBC
+        help
+          Various Freescale chips, including the 8313, include a NAND Flash
+          Controller Module with built-in hardware ECC capabilities.
+          Enabling this option will enable you to use this to control
+          external NAND devices.
+
+config MTD_NAND_FSL_IFC
+        tristate "NAND support for Freescale IFC controller"
+        depends on FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A
+        select FSL_IFC
+        select MEMORY
+        help
+          Various Freescale chips e.g P1010, include a NAND Flash machine
+          with built-in hardware ECC capabilities.
+          Enabling this option will enable you to use this to control
+          external NAND devices.
+
+config MTD_NAND_FSL_UPM
+        tristate "Support for NAND on Freescale UPM"
+        depends on PPC_83xx || PPC_85xx
+        select FSL_LBC
+        help
+          Enables support for NAND Flash chips wired onto Freescale PowerPC
+          processor localbus with User-Programmable Machine support.
+
+config MTD_NAND_MPC5121_NFC
+        tristate "MPC5121 built-in NAND Flash Controller support"
+        depends on PPC_MPC512x
+        help
+          This enables the driver for the NAND flash controller on the
+          MPC5121 SoC.
+
+config MTD_NAND_VF610_NFC
+        tristate "Support for Freescale NFC for VF610/MPC5125"
+        depends on (SOC_VF610 || COMPILE_TEST)
+        depends on HAS_IOMEM
+        help
+          Enables support for NAND Flash Controller on some Freescale
+          processors like the VF610, MPC5125, MCF54418 or Kinetis K70.
+          The driver supports a maximum 2k page size. With 2k pages and
+          64 bytes or more of OOB, hardware ECC with up to 32-bit error
+          correction is supported. Hardware ECC is only enabled through
+          device tree.
+
+config MTD_NAND_MXC
+        tristate "MXC NAND support"
+        depends on ARCH_MXC
+        help
+          This enables the driver for the NAND flash controller on the
+          MXC processors.
+
+config MTD_NAND_SH_FLCTL
+        tristate "Support for NAND on Renesas SuperH FLCTL"
+        depends on SUPERH || COMPILE_TEST
+        depends on HAS_IOMEM
+        depends on HAS_DMA
+        help
+          Several Renesas SuperH CPU has FLCTL. This option enables support
+          for NAND Flash using FLCTL.
+
+config MTD_NAND_DAVINCI
+        tristate "Support NAND on DaVinci/Keystone SoC"
+        depends on ARCH_DAVINCI || (ARCH_KEYSTONE && TI_AEMIF)
+        help
+          Enable the driver for NAND flash chips on Texas Instruments
+          DaVinci/Keystone processors.
+
+config MTD_NAND_TXX9NDFMC
+        tristate "NAND Flash support for TXx9 SoC"
+        depends on SOC_TX4938 || SOC_TX4939
+        help
+          This enables the NAND flash controller on the TXx9 SoCs.
+
+config MTD_NAND_SOCRATES
+        tristate "Support for NAND on Socrates board"
+        depends on SOCRATES
+        help
+          Enables support for NAND Flash chips wired onto Socrates board.
+
+config MTD_NAND_NUC900
+        tristate "Support for NAND on Nuvoton NUC9xx/w90p910 evaluation boards."
+        depends on ARCH_W90X900
+        help
+          This enables the driver for the NAND Flash on evaluation board based
+          on w90p910 / NUC9xx.
+
+config MTD_NAND_JZ4740
+        tristate "Support for JZ4740 SoC NAND controller"
+        depends on MACH_JZ4740
+        help
+                Enables support for NAND Flash on JZ4740 SoC based boards.
+
+config MTD_NAND_JZ4780
+        tristate "Support for NAND on JZ4780 SoC"
+        depends on MACH_JZ4780 && JZ4780_NEMC
+        help
+          Enables support for NAND Flash connected to the NEMC on JZ4780 SoC
+          based boards, using the BCH controller for hardware error correction.
+
+config MTD_NAND_FSMC
+        tristate "Support for NAND on ST Micros FSMC"
+        depends on OF
+        depends on PLAT_SPEAR || ARCH_NOMADIK || ARCH_U8500 || MACH_U300
+        help
+          Enables support for NAND Flash chips on the ST Microelectronics
+          Flexible Static Memory Controller (FSMC)
+
+config MTD_NAND_XWAY
+        bool "Support for NAND on Lantiq XWAY SoC"
+        depends on LANTIQ && SOC_TYPE_XWAY
+        help
+          Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached
+          to the External Bus Unit (EBU).
+
+config MTD_NAND_SUNXI
+        tristate "Support for NAND on Allwinner SoCs"
+        depends on ARCH_SUNXI
+        help
+          Enables support for NAND Flash chips on Allwinner SoCs.
+
+config MTD_NAND_HISI504
+        tristate "Support for NAND controller on Hisilicon SoC Hip04"
+        depends on ARCH_HISI || COMPILE_TEST
+        depends on HAS_DMA
+        help
+          Enables support for NAND controller on Hisilicon SoC Hip04.
+
+config MTD_NAND_QCOM
+        tristate "Support for NAND on QCOM SoCs"
+        depends on ARCH_QCOM
+        help
+          Enables support for NAND flash chips on SoCs containing the EBI2 NAND
+          controller. This controller is found on IPQ806x SoC.
+
+config MTD_NAND_MTK
+        tristate "Support for NAND controller on MTK SoCs"
+        depends on ARCH_MEDIATEK || COMPILE_TEST
+        depends on HAS_DMA
+        help
+          Enables support for NAND controller on MTK SoCs.
+          This controller is found on mt27xx, mt81xx, mt65xx SoCs.
+
+endif # MTD_NAND
diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile
new file mode 100644
index 000000000000..4e0982476267
--- /dev/null
+++ b/drivers/mtd/nand/raw/Makefile
@@ -0,0 +1,68 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_MTD_NAND)                  += nand.o
+obj-$(CONFIG_MTD_NAND_ECC)              += nand_ecc.o
+obj-$(CONFIG_MTD_NAND_BCH)              += nand_bch.o
+obj-$(CONFIG_MTD_SM_COMMON)             += sm_common.o
+
+obj-$(CONFIG_MTD_NAND_CAFE)             += cafe_nand.o
+obj-$(CONFIG_MTD_NAND_AMS_DELTA)        += ams-delta.o
+obj-$(CONFIG_MTD_NAND_DENALI)           += denali.o
+obj-$(CONFIG_MTD_NAND_DENALI_PCI)       += denali_pci.o
+obj-$(CONFIG_MTD_NAND_DENALI_DT)        += denali_dt.o
+obj-$(CONFIG_MTD_NAND_AU1550)           += au1550nd.o
+obj-$(CONFIG_MTD_NAND_BF5XX)            += bf5xx_nand.o
+obj-$(CONFIG_MTD_NAND_S3C2410)          += s3c2410.o
+obj-$(CONFIG_MTD_NAND_TANGO)            += tango_nand.o
+obj-$(CONFIG_MTD_NAND_DAVINCI)          += davinci_nand.o
+obj-$(CONFIG_MTD_NAND_DISKONCHIP)       += diskonchip.o
+obj-$(CONFIG_MTD_NAND_DOCG4)            += docg4.o
+obj-$(CONFIG_MTD_NAND_FSMC)             += fsmc_nand.o
+obj-$(CONFIG_MTD_NAND_SHARPSL)          += sharpsl.o
+obj-$(CONFIG_MTD_NAND_NANDSIM)          += nandsim.o
+obj-$(CONFIG_MTD_NAND_CS553X)           += cs553x_nand.o
+obj-$(CONFIG_MTD_NAND_NDFC)             += ndfc.o
+obj-$(CONFIG_MTD_NAND_ATMEL)            += atmel/
+obj-$(CONFIG_MTD_NAND_GPIO)             += gpio.o
+omap2_nand-objs := omap2.o
+obj-$(CONFIG_MTD_NAND_OMAP2)            += omap2_nand.o
+obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD)   += omap_elm.o
+obj-$(CONFIG_MTD_NAND_CM_X270)          += cmx270_nand.o
+obj-$(CONFIG_MTD_NAND_PXA3xx)           += pxa3xx_nand.o
+obj-$(CONFIG_MTD_NAND_MARVELL)          += marvell_nand.o
+obj-$(CONFIG_MTD_NAND_TMIO)             += tmio_nand.o
+obj-$(CONFIG_MTD_NAND_PLATFORM)         += plat_nand.o
+obj-$(CONFIG_MTD_NAND_PASEMI)           += pasemi_nand.o
+obj-$(CONFIG_MTD_NAND_ORION)            += orion_nand.o
+obj-$(CONFIG_MTD_NAND_OXNAS)            += oxnas_nand.o
+obj-$(CONFIG_MTD_NAND_FSL_ELBC)         += fsl_elbc_nand.o
+obj-$(CONFIG_MTD_NAND_FSL_IFC)          += fsl_ifc_nand.o
+obj-$(CONFIG_MTD_NAND_FSL_UPM)          += fsl_upm.o
+obj-$(CONFIG_MTD_NAND_SLC_LPC32XX)      += lpc32xx_slc.o
+obj-$(CONFIG_MTD_NAND_MLC_LPC32XX)      += lpc32xx_mlc.o
+obj-$(CONFIG_MTD_NAND_SH_FLCTL)         += sh_flctl.o
+obj-$(CONFIG_MTD_NAND_MXC)              += mxc_nand.o
+obj-$(CONFIG_MTD_NAND_SOCRATES)         += socrates_nand.o
+obj-$(CONFIG_MTD_NAND_TXX9NDFMC)        += txx9ndfmc.o
+obj-$(CONFIG_MTD_NAND_NUC900)           += nuc900_nand.o
+obj-$(CONFIG_MTD_NAND_MPC5121_NFC)      += mpc5121_nfc.o
+obj-$(CONFIG_MTD_NAND_VF610_NFC)        += vf610_nfc.o
+obj-$(CONFIG_MTD_NAND_RICOH)            += r852.o
+obj-$(CONFIG_MTD_NAND_JZ4740)           += jz4740_nand.o
+obj-$(CONFIG_MTD_NAND_JZ4780)           += jz4780_nand.o jz4780_bch.o
+obj-$(CONFIG_MTD_NAND_GPMI_NAND)        += gpmi-nand/
+obj-$(CONFIG_MTD_NAND_XWAY)             += xway_nand.o
+obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH)    += bcm47xxnflash/
+obj-$(CONFIG_MTD_NAND_SUNXI)            += sunxi_nand.o
+obj-$(CONFIG_MTD_NAND_HISI504)          += hisi504_nand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND)         += brcmnand/
+obj-$(CONFIG_MTD_NAND_QCOM)             += qcom_nandc.o
+obj-$(CONFIG_MTD_NAND_MTK)              += mtk_ecc.o mtk_nand.o
+
+nand-objs := nand_base.o nand_bbt.o nand_timings.o nand_ids.o
+nand-objs += nand_amd.o
+nand-objs += nand_hynix.o
+nand-objs += nand_macronix.o
+nand-objs += nand_micron.o
+nand-objs += nand_samsung.o
+nand-objs += nand_toshiba.o
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c
index 35f80523e52e..35f80523e52e 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/raw/ams-delta.c
diff --git a/drivers/mtd/nand/atmel/Makefile b/drivers/mtd/nand/raw/atmel/Makefile
index 288db4f38a8f..288db4f38a8f 100644
--- a/drivers/mtd/nand/atmel/Makefile
+++ b/drivers/mtd/nand/raw/atmel/Makefile
diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index 12f6753d47ae..12f6753d47ae 100644
--- a/drivers/mtd/nand/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/raw/atmel/pmecc.c
index 9de29c9afb0c..9de29c9afb0c 100644
--- a/drivers/mtd/nand/atmel/pmecc.c
+++ b/drivers/mtd/nand/raw/atmel/pmecc.c
diff --git a/drivers/mtd/nand/atmel/pmecc.h b/drivers/mtd/nand/raw/atmel/pmecc.h
index 808f1be0d6ad..808f1be0d6ad 100644
--- a/drivers/mtd/nand/atmel/pmecc.h
+++ b/drivers/mtd/nand/raw/atmel/pmecc.h
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/raw/au1550nd.c
index df0ef1f1e2f5..df0ef1f1e2f5 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/raw/au1550nd.c
diff --git a/drivers/mtd/nand/bcm47xxnflash/Makefile b/drivers/mtd/nand/raw/bcm47xxnflash/Makefile
index f05b119e134b..f05b119e134b 100644
--- a/drivers/mtd/nand/bcm47xxnflash/Makefile
+++ b/drivers/mtd/nand/raw/bcm47xxnflash/Makefile
diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/raw/bcm47xxnflash/bcm47xxnflash.h
index 201b9baa52a0..201b9baa52a0 100644
--- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
+++ b/drivers/mtd/nand/raw/bcm47xxnflash/bcm47xxnflash.h
diff --git a/drivers/mtd/nand/bcm47xxnflash/main.c b/drivers/mtd/nand/raw/bcm47xxnflash/main.c
index fb31429b70a9..fb31429b70a9 100644
--- a/drivers/mtd/nand/bcm47xxnflash/main.c
+++ b/drivers/mtd/nand/raw/bcm47xxnflash/main.c
diff --git a/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c b/drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c
index 54bac5b73f0a..54bac5b73f0a 100644
--- a/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
+++ b/drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/raw/bf5xx_nand.c
index 9a1d8d104570..9a1d8d104570 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/raw/bf5xx_nand.c
diff --git a/drivers/mtd/nand/brcmnand/Makefile b/drivers/mtd/nand/raw/brcmnand/Makefile
index 195b845e48b8..195b845e48b8 100644
--- a/drivers/mtd/nand/brcmnand/Makefile
+++ b/drivers/mtd/nand/raw/brcmnand/Makefile
diff --git a/drivers/mtd/nand/brcmnand/bcm63138_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
index 59444b3a697d..59444b3a697d 100644
--- a/drivers/mtd/nand/brcmnand/bcm63138_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
diff --git a/drivers/mtd/nand/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index 34c91b0e1e69..34c91b0e1e69 100644
--- a/drivers/mtd/nand/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index c28fd2bc1a84..c28fd2bc1a84 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
index 5c44cd4aba87..5c44cd4aba87 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.h
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
diff --git a/drivers/mtd/nand/brcmnand/brcmstb_nand.c b/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
index 5c271077ac87..5c271077ac87 100644
--- a/drivers/mtd/nand/brcmnand/brcmstb_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
diff --git a/drivers/mtd/nand/brcmnand/iproc_nand.c b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
index 4c6ae113664d..4c6ae113664d 100644
--- a/drivers/mtd/nand/brcmnand/iproc_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c
index 567ff972d5fc..567ff972d5fc 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/raw/cafe_nand.c
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/raw/cmx270_nand.c
index 02d6751e9efe..02d6751e9efe 100644
--- a/drivers/mtd/nand/cmx270_nand.c
+++ b/drivers/mtd/nand/raw/cmx270_nand.c
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/raw/cs553x_nand.c
index be1f28fc7363..be1f28fc7363 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/raw/cs553x_nand.c
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index ccc8c43abcff..ccc8c43abcff 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/raw/denali.c
index 313c7f50621b..313c7f50621b 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/raw/denali.h
index 9ad33d237378..9ad33d237378 100644
--- a/drivers/mtd/nand/denali.h
+++ b/drivers/mtd/nand/raw/denali.h
diff --git a/drivers/mtd/nand/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c
index cfd33e6ca77f..cfd33e6ca77f 100644
--- a/drivers/mtd/nand/denali_dt.c
+++ b/drivers/mtd/nand/raw/denali_dt.c
diff --git a/drivers/mtd/nand/denali_pci.c b/drivers/mtd/nand/raw/denali_pci.c
index 49cb3e1f8bd0..49cb3e1f8bd0 100644
--- a/drivers/mtd/nand/denali_pci.c
+++ b/drivers/mtd/nand/raw/denali_pci.c
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/raw/diskonchip.c
index 1af77f798fe5..1af77f798fe5 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/raw/diskonchip.c
diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/raw/docg4.c
index 72f1327c4430..72f1327c4430 100644
--- a/drivers/mtd/nand/docg4.c
+++ b/drivers/mtd/nand/raw/docg4.c
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index 8b6dcd739ecb..8b6dcd739ecb 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index 4872a7ba6503..4872a7ba6503 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c
index a88e2cf66e0f..a88e2cf66e0f 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/raw/fsl_upm.c
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 7e66268f8154..7e66268f8154 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/raw/gpio.c
index 2780af26d9ab..2780af26d9ab 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/raw/gpio.c
diff --git a/drivers/mtd/nand/gpmi-nand/Makefile b/drivers/mtd/nand/raw/gpmi-nand/Makefile
index 3a462487c35e..3a462487c35e 100644
--- a/drivers/mtd/nand/gpmi-nand/Makefile
+++ b/drivers/mtd/nand/raw/gpmi-nand/Makefile
diff --git a/drivers/mtd/nand/gpmi-nand/bch-regs.h b/drivers/mtd/nand/raw/gpmi-nand/bch-regs.h
index 05bb91f2f4c4..05bb91f2f4c4 100644
--- a/drivers/mtd/nand/gpmi-nand/bch-regs.h
+++ b/drivers/mtd/nand/raw/gpmi-nand/bch-regs.h
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c
index 97787246af41..97787246af41 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index 61fdd733492f..61fdd733492f 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
index 06c1f993912c..06c1f993912c 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-regs.h b/drivers/mtd/nand/raw/gpmi-nand/gpmi-regs.h
index 82114cdc8330..82114cdc8330 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-regs.h
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-regs.h
diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/raw/hisi504_nand.c
index cb862793ab6d..cb862793ab6d 100644
--- a/drivers/mtd/nand/hisi504_nand.c
+++ b/drivers/mtd/nand/raw/hisi504_nand.c
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/raw/jz4740_nand.c
index 613b00a9604b..613b00a9604b 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/raw/jz4740_nand.c
diff --git a/drivers/mtd/nand/jz4780_bch.c b/drivers/mtd/nand/raw/jz4780_bch.c
index 731c6051d91e..731c6051d91e 100644
--- a/drivers/mtd/nand/jz4780_bch.c
+++ b/drivers/mtd/nand/raw/jz4780_bch.c
diff --git a/drivers/mtd/nand/jz4780_bch.h b/drivers/mtd/nand/raw/jz4780_bch.h
index bf4718088a3a..bf4718088a3a 100644
--- a/drivers/mtd/nand/jz4780_bch.h
+++ b/drivers/mtd/nand/raw/jz4780_bch.h
diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/raw/jz4780_nand.c
index e69f6ae4c539..e69f6ae4c539 100644
--- a/drivers/mtd/nand/jz4780_nand.c
+++ b/drivers/mtd/nand/raw/jz4780_nand.c
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/raw/lpc32xx_mlc.c
index e357948a7505..e357948a7505 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_mlc.c
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/raw/lpc32xx_slc.c
index 5f7cc6da0a7f..5f7cc6da0a7f 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_slc.c
diff --git a/drivers/mtd/nand/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
index cc21f9633edd..cc21f9633edd 100644
--- a/drivers/mtd/nand/marvell_nand.c
+++ b/drivers/mtd/nand/raw/marvell_nand.c
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/raw/mpc5121_nfc.c
index 913b9d1225c6..913b9d1225c6 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/raw/mpc5121_nfc.c
diff --git a/drivers/mtd/nand/mtk_ecc.c b/drivers/mtd/nand/raw/mtk_ecc.c
index 40d86a861a70..40d86a861a70 100644
--- a/drivers/mtd/nand/mtk_ecc.c
+++ b/drivers/mtd/nand/raw/mtk_ecc.c
diff --git a/drivers/mtd/nand/mtk_ecc.h b/drivers/mtd/nand/raw/mtk_ecc.h
index a455df080952..a455df080952 100644
--- a/drivers/mtd/nand/mtk_ecc.h
+++ b/drivers/mtd/nand/raw/mtk_ecc.h
diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c
index 6977da3a26aa..6977da3a26aa 100644
--- a/drivers/mtd/nand/mtk_nand.c
+++ b/drivers/mtd/nand/raw/mtk_nand.c
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 87b5ee66e501..87b5ee66e501 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
diff --git a/drivers/mtd/nand/nand_amd.c b/drivers/mtd/nand/raw/nand_amd.c
index 22f060f38123..22f060f38123 100644
--- a/drivers/mtd/nand/nand_amd.c
+++ b/drivers/mtd/nand/raw/nand_amd.c
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index e70ca16a5118..e70ca16a5118 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 36092850be2c..36092850be2c 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c
index 505441c9373b..505441c9373b 100644
--- a/drivers/mtd/nand/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/raw/nand_ecc.c
index 3630f0fe8fa4..3630f0fe8fa4 100644
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/raw/nand_ecc.c
diff --git a/drivers/mtd/nand/nand_hynix.c b/drivers/mtd/nand/raw/nand_hynix.c
index d542908a0ebb..d542908a0ebb 100644
--- a/drivers/mtd/nand/nand_hynix.c
+++ b/drivers/mtd/nand/raw/nand_hynix.c
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c
index 5423c3bb388e..5423c3bb388e 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/raw/nand_ids.c
diff --git a/drivers/mtd/nand/nand_macronix.c b/drivers/mtd/nand/raw/nand_macronix.c
index d290ff2a6d2f..d290ff2a6d2f 100644
--- a/drivers/mtd/nand/nand_macronix.c
+++ b/drivers/mtd/nand/raw/nand_macronix.c
diff --git a/drivers/mtd/nand/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c
index 02e109ae73f1..02e109ae73f1 100644
--- a/drivers/mtd/nand/nand_micron.c
+++ b/drivers/mtd/nand/raw/nand_micron.c
diff --git a/drivers/mtd/nand/nand_samsung.c b/drivers/mtd/nand/raw/nand_samsung.c
index ef022f62f74c..ef022f62f74c 100644
--- a/drivers/mtd/nand/nand_samsung.c
+++ b/drivers/mtd/nand/raw/nand_samsung.c
diff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/raw/nand_timings.c
index 9400d039ddbd..9400d039ddbd 100644
--- a/drivers/mtd/nand/nand_timings.c
+++ b/drivers/mtd/nand/raw/nand_timings.c
diff --git a/drivers/mtd/nand/nand_toshiba.c b/drivers/mtd/nand/raw/nand_toshiba.c
index ab43f027cd23..ab43f027cd23 100644
--- a/drivers/mtd/nand/nand_toshiba.c
+++ b/drivers/mtd/nand/raw/nand_toshiba.c
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/raw/nandsim.c
index 44322a363ba5..44322a363ba5 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/raw/nandsim.c
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/raw/ndfc.c
index d8a806894937..d8a806894937 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/raw/ndfc.c
diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/raw/nuc900_nand.c
index af5b32c9a791..af5b32c9a791 100644
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/raw/nuc900_nand.c
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/raw/omap2.c
index 8cdf7d3d8fa7..8cdf7d3d8fa7 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/raw/omap2.c
diff --git a/drivers/mtd/nand/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c
index a3f32f939cc1..a3f32f939cc1 100644
--- a/drivers/mtd/nand/omap_elm.c
+++ b/drivers/mtd/nand/raw/omap_elm.c
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/raw/orion_nand.c
index 7825fd3ce66b..7825fd3ce66b 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/raw/orion_nand.c
diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/raw/oxnas_nand.c
index d649d5944826..d649d5944826 100644
--- a/drivers/mtd/nand/oxnas_nand.c
+++ b/drivers/mtd/nand/raw/oxnas_nand.c
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/raw/pasemi_nand.c
index a47a7e4bd25a..a47a7e4bd25a 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/raw/pasemi_nand.c
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/raw/plat_nand.c
index 925a1323604d..925a1323604d 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/raw/plat_nand.c
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index d75f30263d21..d75f30263d21 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index 563b759ffca6..563b759ffca6 100644
--- a/drivers/mtd/nand/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/raw/r852.c
index 595635b9e9de..595635b9e9de 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/raw/r852.c
diff --git a/drivers/mtd/nand/r852.h b/drivers/mtd/nand/raw/r852.h
index 8713c57f6207..8713c57f6207 100644
--- a/drivers/mtd/nand/r852.h
+++ b/drivers/mtd/nand/raw/r852.h
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/raw/s3c2410.c
index b5bc5f106c09..b5bc5f106c09 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/raw/s3c2410.c
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c
index c4e7755448e6..c4e7755448e6 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/raw/sh_flctl.c
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/raw/sharpsl.c
index e93df02c825e..e93df02c825e 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/raw/sharpsl.c
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/raw/sm_common.c
index c378705c6e2b..c378705c6e2b 100644
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/raw/sm_common.c
diff --git a/drivers/mtd/nand/sm_common.h b/drivers/mtd/nand/raw/sm_common.h
index 1581671b05ae..1581671b05ae 100644
--- a/drivers/mtd/nand/sm_common.h
+++ b/drivers/mtd/nand/raw/sm_common.h
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/raw/socrates_nand.c
index 9824a9923583..9824a9923583 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/raw/socrates_nand.c
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index f5a55c63935c..f5a55c63935c 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/raw/tango_nand.c
index c5bee00b7f5e..c5bee00b7f5e 100644
--- a/drivers/mtd/nand/tango_nand.c
+++ b/drivers/mtd/nand/raw/tango_nand.c
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/raw/tmio_nand.c
index dcaa924502de..dcaa924502de 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/raw/tmio_nand.c
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/raw/txx9ndfmc.c
index b567d212fe7d..b567d212fe7d 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/raw/txx9ndfmc.c
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 5d7a1f8f580f..5d7a1f8f580f 100644
--- a/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/raw/xway_nand.c
index 9926b4e3d69d..9926b4e3d69d 100644
--- a/drivers/mtd/nand/xway_nand.c
+++ b/drivers/mtd/nand/raw/xway_nand.c
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
index 4237c7cebf02..fa176f5937bb 100644
--- a/drivers/mtd/sm_ftl.c
+++ b/drivers/mtd/sm_ftl.c
@@ -17,7 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/slab.h>
 #include <linux/mtd/nand_ecc.h>
-#include "nand/sm_common.h"
+#include "nand/raw/sm_common.h"
 #include "sm_ftl.h"