87 files changed, 4132 insertions, 2544 deletions
diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
index c3748b414c27..0322df9dc249 100644
--- a/drivers/memory/atmel-ebi.c
+++ b/drivers/memory/atmel-ebi.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/of_device.h>
 #include <linux/regmap.h>
+#include <soc/at91/atmel-sfr.h>
 struct atmel_ebi_dev_config {
        int cs;
@@ -36,6 +37,7 @@ struct atmel_ebi_dev {
 struct atmel_ebi_caps {
        unsigned int available_cs;
        unsigned int ebi_csa_offs;
+        const char *regmap_name;
        void (*get_config)(struct atmel_ebi_dev *ebid,
                           struct atmel_ebi_dev_config *conf);
        int (*xlate_config)(struct atmel_ebi_dev *ebid,
@@ -47,7 +49,7 @@ struct atmel_ebi_caps {
 struct atmel_ebi {
        struct clk *clk;
-        struct regmap *matrix;
+        struct regmap *regmap;
        struct  {
                struct regmap *regmap;
                struct clk *clk;
@@ -357,7 +359,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
                 * one "atmel,smc-" property is present.
                 */
                if (ebi->caps->ebi_csa_offs && apply)
-                        regmap_update_bits(ebi->matrix,
+                        regmap_update_bits(ebi->regmap,
                                           ebi->caps->ebi_csa_offs,
                                           BIT(cs), 0);
@@ -372,6 +374,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
 static const struct atmel_ebi_caps at91sam9260_ebi_caps = {
        .available_cs = 0xff,
        .ebi_csa_offs = AT91SAM9260_MATRIX_EBICSA,
+        .regmap_name = "atmel,matrix",
        .get_config = at91sam9_ebi_get_config,
        .xlate_config = atmel_ebi_xslate_smc_config,
        .apply_config = at91sam9_ebi_apply_config,
@@ -380,6 +383,7 @@ static const struct atmel_ebi_caps at91sam9260_ebi_caps = {
 static const struct atmel_ebi_caps at91sam9261_ebi_caps = {
        .available_cs = 0xff,
        .ebi_csa_offs = AT91SAM9261_MATRIX_EBICSA,
+        .regmap_name = "atmel,matrix",
        .get_config = at91sam9_ebi_get_config,
        .xlate_config = atmel_ebi_xslate_smc_config,
        .apply_config = at91sam9_ebi_apply_config,
@@ -388,6 +392,7 @@ static const struct atmel_ebi_caps at91sam9261_ebi_caps = {
 static const struct atmel_ebi_caps at91sam9263_ebi0_caps = {
        .available_cs = 0x3f,
        .ebi_csa_offs = AT91SAM9263_MATRIX_EBI0CSA,
+        .regmap_name = "atmel,matrix",
        .get_config = at91sam9_ebi_get_config,
        .xlate_config = atmel_ebi_xslate_smc_config,
        .apply_config = at91sam9_ebi_apply_config,
@@ -396,6 +401,7 @@ static const struct atmel_ebi_caps at91sam9263_ebi0_caps = {
 static const struct atmel_ebi_caps at91sam9263_ebi1_caps = {
        .available_cs = 0x7,
        .ebi_csa_offs = AT91SAM9263_MATRIX_EBI1CSA,
+        .regmap_name = "atmel,matrix",
        .get_config = at91sam9_ebi_get_config,
        .xlate_config = atmel_ebi_xslate_smc_config,
        .apply_config = at91sam9_ebi_apply_config,
@@ -404,6 +410,7 @@ static const struct atmel_ebi_caps at91sam9263_ebi1_caps = {
 static const struct atmel_ebi_caps at91sam9rl_ebi_caps = {
        .available_cs = 0x3f,
        .ebi_csa_offs = AT91SAM9RL_MATRIX_EBICSA,
+        .regmap_name = "atmel,matrix",
        .get_config = at91sam9_ebi_get_config,
        .xlate_config = atmel_ebi_xslate_smc_config,
        .apply_config = at91sam9_ebi_apply_config,
@@ -412,6 +419,7 @@ static const struct atmel_ebi_caps at91sam9rl_ebi_caps = {
 static const struct atmel_ebi_caps at91sam9g45_ebi_caps = {
        .available_cs = 0x3f,
        .ebi_csa_offs = AT91SAM9G45_MATRIX_EBICSA,
+        .regmap_name = "atmel,matrix",
        .get_config = at91sam9_ebi_get_config,
        .xlate_config = atmel_ebi_xslate_smc_config,
        .apply_config = at91sam9_ebi_apply_config,
@@ -420,6 +428,7 @@ static const struct atmel_ebi_caps at91sam9g45_ebi_caps = {
 static const struct atmel_ebi_caps at91sam9x5_ebi_caps = {
        .available_cs = 0x3f,
        .ebi_csa_offs = AT91SAM9X5_MATRIX_EBICSA,
+        .regmap_name = "atmel,matrix",
        .get_config = at91sam9_ebi_get_config,
        .xlate_config = atmel_ebi_xslate_smc_config,
        .apply_config = at91sam9_ebi_apply_config,
@@ -432,6 +441,15 @@ static const struct atmel_ebi_caps sama5d3_ebi_caps = {
        .apply_config = sama5_ebi_apply_config,
 };
+static const struct atmel_ebi_caps sam9x60_ebi_caps = {
+        .available_cs = 0x3f,
+        .ebi_csa_offs = AT91_SFR_CCFG_EBICSA,
+        .regmap_name = "microchip,sfr",
+        .get_config = at91sam9_ebi_get_config,
+        .xlate_config = atmel_ebi_xslate_smc_config,
+        .apply_config = at91sam9_ebi_apply_config,
+};
 static const struct of_device_id atmel_ebi_id_table[] = {
        {
                .compatible = "atmel,at91sam9260-ebi",
@@ -465,6 +483,10 @@ static const struct of_device_id atmel_ebi_id_table[] = {
                .compatible = "atmel,sama5d3-ebi",
                .data = &sama5d3_ebi_caps,
        },
+        {
+                .compatible = "microchip,sam9x60-ebi",
+                .data = &sam9x60_ebi_caps,
+        },
        { /* sentinel */ }
 };
@@ -543,13 +565,14 @@ static int atmel_ebi_probe(struct platform_device *pdev)
        /*
         * The sama5d3 does not provide an EBICSA register and thus does need
-         * to access the matrix registers.
+         * to access it.
         */
        if (ebi->caps->ebi_csa_offs) {
-                ebi->matrix =
+                ebi->regmap =
-                        syscon_regmap_lookup_by_phandle(np, "atmel,matrix");
+                        syscon_regmap_lookup_by_phandle(np,
-                if (IS_ERR(ebi->matrix))
+                                                        ebi->caps->regmap_name);
-                        return PTR_ERR(ebi->matrix);
+                if (IS_ERR(ebi->regmap))
+                        return PTR_ERR(ebi->regmap);
        }
        ret = of_property_read_u32(np, "#address-cells", &val);
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 79a8ff542883..fb31a7f649a3 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -60,22 +60,6 @@ config MTD_CMDLINE_PARTS
          If unsure, say 'N'.
-config MTD_AFS_PARTS
-        tristate "ARM Firmware Suite partition parsing"
-        depends on (ARM || ARM64)
-        help
-          The ARM Firmware Suite allows the user to divide flash devices into
-          multiple 'images'. Each such image has a header containing its name
-          and offset/size etc.
-          If you need code which can detect and parse these tables, and
-          register MTD 'partitions' corresponding to each image detected,
-          enable this option.
-          You will still need the parsing functions to be called by the driver
-          for your particular device. It won't happen automatically. The
-          'physmap' map driver (CONFIG_MTD_PHYSMAP) does this, for example.
 config MTD_OF_PARTS
        tristate "OpenFirmware partitioning information support"
        default y
@@ -94,6 +78,7 @@ config MTD_BCM63XX_PARTS
        tristate "BCM63XX CFE partitioning support"
        depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST
        select CRC32
+        select MTD_PARSER_IMAGETAG
        help
          This provides partition parsing for BCM63xx devices with CFE
          bootloaders.
@@ -230,12 +215,11 @@ config SSFDC
          This enables read only access to SmartMedia formatted NAND
          flash. You can mount it with FAT file system.
 config SM_FTL
        tristate "SmartMedia/xD new translation layer"
        depends on BLOCK
        select MTD_BLKDEVS
-        select MTD_NAND_ECC
+        select MTD_NAND_ECC_SW_HAMMING
        help
          This enables EXPERIMENTAL R/W support for SmartMedia/xD
          FTL (Flash translation layer).
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 58fc327a5276..806287e80e84 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -9,7 +9,6 @@ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
 obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
-obj-$(CONFIG_MTD_AFS_PARTS)     += afs.o
 obj-$(CONFIG_MTD_AR7_PARTS)     += ar7part.o
 obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o
 obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o
diff --git a/drivers/mtd/afs.c b/drivers/mtd/afs.c
deleted file mode 100644
index d61b7edfc938..000000000000
--- a/drivers/mtd/afs.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*======================================================================
-    drivers/mtd/afs.c: ARM Flash Layout/Partitioning
-    Copyright © 2000 ARM Limited
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   This is access code for flashes using ARM's flash partitioning
-   standards.
-======================================================================*/
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#define AFSV1_FOOTER_MAGIC 0xA0FFFF9F
-struct footer_v1 {
-        u32 image_info_base;    /* Address of first word of ImageFooter  */
-        u32 image_start;        /* Start of area reserved by this footer */
-        u32 signature;          /* 'Magic' number proves it's a footer   */
-        u32 type;               /* Area type: ARM Image, SIB, customer   */
-        u32 checksum;           /* Just this structure                   */
-};
-struct image_info_v1 {
-        u32 bootFlags;          /* Boot flags, compression etc.          */
-        u32 imageNumber;        /* Unique number, selects for boot etc.  */
-        u32 loadAddress;        /* Address program should be loaded to   */
-        u32 length;             /* Actual size of image                  */
-        u32 address;            /* Image is executed from here           */
-        char name[16];          /* Null terminated                       */
-        u32 headerBase;         /* Flash Address of any stripped header  */
-        u32 header_length;      /* Length of header in memory            */
-        u32 headerType;         /* AIF, RLF, s-record etc.               */
-        u32 checksum;           /* Image checksum (inc. this struct)     */
-};
-static u32 word_sum(void *words, int num)
-{
-        u32 *p = words;
-        u32 sum = 0;
-        while (num--)
-                sum += *p++;
-        return sum;
-}
-static int
-afs_read_footer_v1(struct mtd_info *mtd, u_int *img_start, u_int *iis_start,
-                   u_int off, u_int mask)
-{
-        struct footer_v1 fs;
-        u_int ptr = off + mtd->erasesize - sizeof(fs);
-        size_t sz;
-        int ret;
-        ret = mtd_read(mtd, ptr, sizeof(fs), &sz, (u_char *)&fs);
-        if (ret >= 0 && sz != sizeof(fs))
-                ret = -EINVAL;
-        if (ret < 0) {
-                printk(KERN_ERR "AFS: mtd read failed at 0x%x: %d\n",
-                        ptr, ret);
-                return ret;
-        }
-        /*
-         * Does it contain the magic number?
-         */
-        if (fs.signature != AFSV1_FOOTER_MAGIC)
-                return 0;
-        /*
-         * Check the checksum.
-         */
-        if (word_sum(&fs, sizeof(fs) / sizeof(u32)) != 0xffffffff)
-                return 0;
-        /*
-         * Don't touch the SIB.
-         */
-        if (fs.type == 2)
-                return 0;
-        *iis_start = fs.image_info_base & mask;
-        *img_start = fs.image_start & mask;
-        /*
-         * Check the image info base.  This can not
-         * be located after the footer structure.
-         */
-        if (*iis_start >= ptr)
-                return 0;
-        /*
-         * Check the start of this image.  The image
-         * data can not be located after this block.
-         */
-        if (*img_start > off)
-                return 0;
-        return 1;
-}
-static int
-afs_read_iis_v1(struct mtd_info *mtd, struct image_info_v1 *iis, u_int ptr)
-{
-        size_t sz;
-        int ret, i;
-        memset(iis, 0, sizeof(*iis));
-        ret = mtd_read(mtd, ptr, sizeof(*iis), &sz, (u_char *)iis);
-        if (ret < 0)
-                goto failed;
-        if (sz != sizeof(*iis)) {
-                ret = -EINVAL;
-                goto failed;
-        }
-        ret = 0;
-        /*
-         * Validate the name - it must be NUL terminated.
-         */
-        for (i = 0; i < sizeof(iis->name); i++)
-                if (iis->name[i] == '\0')
-                        break;
-        if (i < sizeof(iis->name))
-                ret = 1;
-        return ret;
- failed:
-        printk(KERN_ERR "AFS: mtd read failed at 0x%x: %d\n",
-                ptr, ret);
-        return ret;
-}
-static int parse_afs_partitions(struct mtd_info *mtd,
-                                const struct mtd_partition **pparts,
-                                struct mtd_part_parser_data *data)
-{
-        struct mtd_partition *parts;
-        u_int mask, off, idx, sz;
-        int ret = 0;
-        char *str;
-        /*
-         * This is the address mask; we use this to mask off out of
-         * range address bits.
-         */
-        mask = mtd->size - 1;
-        /*
-         * First, calculate the size of the array we need for the
-         * partition information.  We include in this the size of
-         * the strings.
-         */
-        for (idx = off = sz = 0; off < mtd->size; off += mtd->erasesize) {
-                struct image_info_v1 iis;
-                u_int iis_ptr, img_ptr;
-                ret = afs_read_footer_v1(mtd, &img_ptr, &iis_ptr, off, mask);
-                if (ret < 0)
-                        break;
-                if (ret) {
-                        ret = afs_read_iis_v1(mtd, &iis, iis_ptr);
-                        if (ret < 0)
-                                break;
-                        if (ret == 0)
-                                continue;
-                        sz += sizeof(struct mtd_partition);
-                        sz += strlen(iis.name) + 1;
-                        idx += 1;
-                }
-        }
-        if (!sz)
-                return ret;
-        parts = kzalloc(sz, GFP_KERNEL);
-        if (!parts)
-                return -ENOMEM;
-        str = (char *)(parts + idx);
-        /*
-         * Identify the partitions
-         */
-        for (idx = off = 0; off < mtd->size; off += mtd->erasesize) {
-                struct image_info_v1 iis;
-                u_int iis_ptr, img_ptr;
-                /* Read the footer. */
-                ret = afs_read_footer_v1(mtd, &img_ptr, &iis_ptr, off, mask);
-                if (ret < 0)
-                        break;
-                if (ret == 0)
-                        continue;
-                /* Read the image info block */
-                ret = afs_read_iis_v1(mtd, &iis, iis_ptr);
-                if (ret < 0)
-                        break;
-                if (ret == 0)
-                        continue;
-                strcpy(str, iis.name);
-                parts[idx].name         = str;
-                parts[idx].size         = (iis.length + mtd->erasesize - 1) & ~(mtd->erasesize - 1);
-                parts[idx].offset       = img_ptr;
-                parts[idx].mask_flags   = 0;
-                printk("  mtd%d: at 0x%08x, %5lluKiB, %8u, %s\n",
-                        idx, img_ptr, parts[idx].size / 1024,
-                        iis.imageNumber, str);
-                idx += 1;
-                str = str + strlen(iis.name) + 1;
-        }
-        if (!idx) {
-                kfree(parts);
-                parts = NULL;
-        }
-        *pparts = parts;
-        return idx ? idx : ret;
-}
-static struct mtd_part_parser afs_parser = {
-        .parse_fn = parse_afs_partitions,
-        .name = "afs",
-};
-module_mtd_part_parser(afs_parser);
-MODULE_AUTHOR("ARM Ltd");
-MODULE_DESCRIPTION("ARM Firmware Suite partition parser");
-MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c
index 41d1d3149c61..b2bd04764e95 100644
--- a/drivers/mtd/bcm63xxpart.c
+++ b/drivers/mtd/bcm63xxpart.c
@@ -34,6 +34,7 @@
 #include <linux/vmalloc.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/of.h>
 #define BCM963XX_CFE_BLOCK_SIZE         SZ_64K  /* always at least 64KiB */
@@ -93,51 +94,19 @@ static int bcm63xx_read_nvram(struct mtd_info *master,
        return 0;
 }
-static int bcm63xx_read_image_tag(struct mtd_info *master, const char *name,
+static const char * const bcm63xx_cfe_part_types[] = {
-        loff_t tag_offset, struct bcm_tag *buf)
+        "bcm963xx-imagetag",
-{
+        NULL,
-        int ret;
+};
-        size_t retlen;
-        u32 computed_crc;
-        ret = mtd_read(master, tag_offset, sizeof(*buf), &retlen, (void *)buf);
-        if (ret)
-                return ret;
-        if (retlen != sizeof(*buf))
-                return -EIO;
-        computed_crc = crc32_le(IMAGETAG_CRC_START, (u8 *)buf,
-                                offsetof(struct bcm_tag, header_crc));
-        if (computed_crc == buf->header_crc) {
-                STR_NULL_TERMINATE(buf->board_id);
-                STR_NULL_TERMINATE(buf->tag_version);
-                pr_info("%s: CFE image tag found at 0x%llx with version %s, board type %s\n",
-                        name, tag_offset, buf->tag_version, buf->board_id);
-                return 0;
-        }
-        pr_warn("%s: CFE image tag at 0x%llx CRC invalid (expected %08x, actual %08x)\n",
-                name, tag_offset, buf->header_crc, computed_crc);
-        return 1;
-}
 static int bcm63xx_parse_cfe_nor_partitions(struct mtd_info *master,
        const struct mtd_partition **pparts, struct bcm963xx_nvram *nvram)
 {
-        /* CFE, NVRAM and global Linux are always present */
-        int nrparts = 3, curpart = 0;
-        struct bcm_tag *buf = NULL;
        struct mtd_partition *parts;
-        int ret;
+        int nrparts = 3, curpart = 0;
-        unsigned int rootfsaddr, kerneladdr, spareaddr;
-        unsigned int rootfslen, kernellen, sparelen, totallen;
        unsigned int cfelen, nvramlen;
        unsigned int cfe_erasesize;
        int i;
-        bool rootfs_first = false;
        cfe_erasesize = max_t(uint32_t, master->erasesize,
                              BCM963XX_CFE_BLOCK_SIZE);
@@ -146,83 +115,9 @@ static int bcm63xx_parse_cfe_nor_partitions(struct mtd_info *master,
        nvramlen = nvram->psi_size * SZ_1K;
        nvramlen = roundup(nvramlen, cfe_erasesize);
-        buf = vmalloc(sizeof(struct bcm_tag));
-        if (!buf)
-                return -ENOMEM;
-        /* Get the tag */
-        ret = bcm63xx_read_image_tag(master, "rootfs", cfelen, buf);
-        if (!ret) {
-                STR_NULL_TERMINATE(buf->flash_image_start);
-                if (kstrtouint(buf->flash_image_start, 10, &rootfsaddr) ||
-                                rootfsaddr < BCM963XX_EXTENDED_SIZE) {
-                        pr_err("invalid rootfs address: %*ph\n",
-                                (int)sizeof(buf->flash_image_start),
-                                buf->flash_image_start);
-                        goto invalid_tag;
-                }
-                STR_NULL_TERMINATE(buf->kernel_address);
-                if (kstrtouint(buf->kernel_address, 10, &kerneladdr) ||
-                                kerneladdr < BCM963XX_EXTENDED_SIZE) {
-                        pr_err("invalid kernel address: %*ph\n",
-                                (int)sizeof(buf->kernel_address),
-                                buf->kernel_address);
-                        goto invalid_tag;
-                }
-                STR_NULL_TERMINATE(buf->kernel_length);
-                if (kstrtouint(buf->kernel_length, 10, &kernellen)) {
-                        pr_err("invalid kernel length: %*ph\n",
-                                (int)sizeof(buf->kernel_length),
-                                buf->kernel_length);
-                        goto invalid_tag;
-                }
-                STR_NULL_TERMINATE(buf->total_length);
-                if (kstrtouint(buf->total_length, 10, &totallen)) {
-                        pr_err("invalid total length: %*ph\n",
-                                (int)sizeof(buf->total_length),
-                                buf->total_length);
-                        goto invalid_tag;
-                }
-                kerneladdr = kerneladdr - BCM963XX_EXTENDED_SIZE;
-                rootfsaddr = rootfsaddr - BCM963XX_EXTENDED_SIZE;
-                spareaddr = roundup(totallen, master->erasesize) + cfelen;
-                if (rootfsaddr < kerneladdr) {
-                        /* default Broadcom layout */
-                        rootfslen = kerneladdr - rootfsaddr;
-                        rootfs_first = true;
-                } else {
-                        /* OpenWrt layout */
-                        rootfsaddr = kerneladdr + kernellen;
-                        rootfslen = spareaddr - rootfsaddr;
-                }
-        } else if (ret > 0) {
-invalid_tag:
-                kernellen = 0;
-                rootfslen = 0;
-                rootfsaddr = 0;
-                spareaddr = cfelen;
-        } else {
-                goto out;
-        }
-        sparelen = master->size - spareaddr - nvramlen;
-        /* Determine number of partitions */
-        if (rootfslen > 0)
-                nrparts++;
-        if (kernellen > 0)
-                nrparts++;
        parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
-        if (!parts) {
+        if (!parts)
-                ret = -ENOMEM;
+                return -ENOMEM;
-                goto out;
-        }
        /* Start building partition list */
        parts[curpart].name = "CFE";
@@ -230,30 +125,6 @@ invalid_tag:
        parts[curpart].size = cfelen;
        curpart++;
-        if (kernellen > 0) {
-                int kernelpart = curpart;
-                if (rootfslen > 0 && rootfs_first)
-                        kernelpart++;
-                parts[kernelpart].name = "kernel";
-                parts[kernelpart].offset = kerneladdr;
-                parts[kernelpart].size = kernellen;
-                curpart++;
-        }
-        if (rootfslen > 0) {
-                int rootfspart = curpart;
-                if (kernellen > 0 && rootfs_first)
-                        rootfspart--;
-                parts[rootfspart].name = "rootfs";
-                parts[rootfspart].offset = rootfsaddr;
-                parts[rootfspart].size = rootfslen;
-                if (sparelen > 0  && !rootfs_first)
-                        parts[rootfspart].size += sparelen;
-                curpart++;
-        }
        parts[curpart].name = "nvram";
        parts[curpart].offset = master->size - nvramlen;
        parts[curpart].size = nvramlen;
@@ -263,22 +134,13 @@ invalid_tag:
        parts[curpart].name = "linux";
        parts[curpart].offset = cfelen;
        parts[curpart].size = master->size - cfelen - nvramlen;
+        parts[curpart].types = bcm63xx_cfe_part_types;
        for (i = 0; i < nrparts; i++)
                pr_info("Partition %d is %s offset %llx and length %llx\n", i,
                        parts[i].name, parts[i].offset, parts[i].size);
-        pr_info("Spare partition is offset %x and length %x\n", spareaddr,
-                sparelen);
        *pparts = parts;
-        ret = 0;
-out:
-        vfree(buf);
-        if (ret)
-                return ret;
        return nrparts;
 }
@@ -311,9 +173,16 @@ out:
        return ret;
 };
+static const struct of_device_id parse_bcm63xx_cfe_match_table[] = {
+        { .compatible = "brcm,bcm963xx-cfe-nor-partitions" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, parse_bcm63xx_cfe_match_table);
 static struct mtd_part_parser bcm63xx_cfe_parser = {
        .parse_fn = bcm63xx_parse_cfe_partitions,
        .name = "bcm63xxpart",
+        .of_match_table = parse_bcm63xx_cfe_match_table,
 };
 module_mtd_part_parser(bcm63xx_cfe_parser);
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 7b7286b4d81e..c8fa5906bdf9 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -869,6 +869,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
                /* Only if there's no operation suspended... */
                if (mode == FL_READY && chip->oldstate == FL_READY)
                        return 0;
+                /* fall through */
        default:
        sleep:
@@ -2751,6 +2752,7 @@ static void cfi_amdstd_sync (struct mtd_info *mtd)
                         * as the whole point is that nobody can do anything
                         * with the chip now anyway.
                         */
+                        /* fall through */
                case FL_SYNCING:
                        mutex_unlock(&chip->mutex);
                        break;
diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
index 6f16552cd59f..e3b266ee06af 100644
--- a/drivers/mtd/chips/cfi_util.c
+++ b/drivers/mtd/chips/cfi_util.c
@@ -109,10 +109,13 @@ map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cfi_private *cfi
        case 8:
                onecmd |= (onecmd << (chip_mode * 32));
 #endif
+                /* fall through */
        case 4:
                onecmd |= (onecmd << (chip_mode * 16));
+                /* fall through */
        case 2:
                onecmd |= (onecmd << (chip_mode * 8));
+                /* fall through */
        case 1:
                ;
        }
@@ -162,10 +165,13 @@ unsigned long cfi_merge_status(map_word val, struct map_info *map,
        case 8:
                res |= (onestat >> (chip_mode * 32));
 #endif
+                /* fall through */
        case 4:
                res |= (onestat >> (chip_mode * 16));
+                /* fall through */
        case 2:
                res |= (onestat >> (chip_mode * 8));
+                /* fall through */
        case 1:
                ;
        }
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index aa983422aa97..f9258d666846 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -207,7 +207,7 @@ comment "Disk-On-Chip Device Drivers"
 config MTD_DOCG3
        tristate "M-Systems Disk-On-Chip G3"
        select BCH
-        select BCH_CONST_PARAMS if !MTD_NAND_BCH
+        select BCH_CONST_PARAMS if !MTD_NAND_ECC_SW_BCH
        select BITREVERSE
        help
          This provides an MTD device driver for the M-Systems DiskOnChip
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 9ee04b5f9311..8a8627c30aed 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -147,8 +147,10 @@ static int parse_num64(uint64_t *num64, char *token)
                        switch (token[len - 2]) {
                        case 'G':
                                shift += 10;
+                                /* fall through */
                        case 'M':
                                shift += 10;
+                                /* fall through */
                        case 'k':
                                shift += 10;
                                token[len - 2] = 0;
diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index b13557fe52bd..76a4c73e100e 100644
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -318,6 +318,7 @@ static int chip_ready(struct map_info *map, struct flchip *chip, int mode)
                /* Only if there's no operation suspended... */
                if (mode == FL_READY && chip->oldstate == FL_READY)
                        return 0;
+                /* fall through */
        default:
 sleep:
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index e0cf869c8544..544ed1931843 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -10,7 +10,7 @@ config MTD_COMPLEX_MAPPINGS
 config MTD_PHYSMAP
        tristate "Flash device in physical memory map"
-        depends on MTD_CFI || MTD_JEDECPROBE || MTD_ROM || MTD_LPDDR
+        depends on MTD_CFI || MTD_JEDECPROBE || MTD_ROM || MTD_RAM || MTD_LPDDR
        help
          This provides a 'mapping' driver which allows the NOR Flash and
          ROM driver code to communicate with chips which are mapped
diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
index d9a3e4bebe5d..21b556afc305 100644
--- a/drivers/mtd/maps/physmap-core.c
+++ b/drivers/mtd/maps/physmap-core.c
@@ -132,6 +132,8 @@ static void physmap_set_addr_gpios(struct physmap_flash_info *info,
                gpiod_set_value(info->gpios->desc[i], !!(BIT(i) & ofs));
        }
+        info->gpio_values = ofs;
 }
 #define win_mask(order)         (BIT(order) - 1)
diff --git a/drivers/mtd/maps/physmap-gemini.c b/drivers/mtd/maps/physmap-gemini.c
index 60775b208fc9..a289c8b5cabf 100644
--- a/drivers/mtd/maps/physmap-gemini.c
+++ b/drivers/mtd/maps/physmap-gemini.c
@@ -86,7 +86,7 @@ static void gemini_flash_disable_pins(void)
 static map_word __xipram gemini_flash_map_read(struct map_info *map,
                                               unsigned long ofs)
 {
-        map_word __xipram ret;
+        map_word ret;
        gemini_flash_enable_pins();
        ret = inline_map_read(map, ofs);
diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index aef030ca8601..de4c46318abb 100644
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -31,13 +31,7 @@
 #define MAP_NAME "ram"
 #endif
-/*
+static struct map_info uclinux_ram_map = {
- * Blackfin uses uclinux_ram_map during startup, so it must not be static.
- * Provide a dummy declaration to make sparse happy.
- */
-extern struct map_info uclinux_ram_map;
-struct map_info uclinux_ram_map = {
        .name = MAP_NAME,
        .size = 0,
 };
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 37f174ccbcec..dfa241ad018b 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -572,7 +572,7 @@ static ssize_t mtd_partition_offset_show(struct device *dev,
 {
        struct mtd_info *mtd = dev_get_drvdata(dev);
        struct mtd_part *part = mtd_to_part(mtd);
-        return snprintf(buf, PAGE_SIZE, "%lld\n", part->offset);
+        return snprintf(buf, PAGE_SIZE, "%llu\n", part->offset);
 }
 static DEVICE_ATTR(offset, S_IRUGO, mtd_partition_offset_show, NULL);
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 9033215e62ea..495751ed3fd7 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -2,6 +2,5 @@ config MTD_NAND_CORE
        tristate
 source "drivers/mtd/nand/onenand/Kconfig"
 source "drivers/mtd/nand/raw/Kconfig"
 source "drivers/mtd/nand/spi/Kconfig"
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c
index 9c9f8936b63b..b6de955ac8bf 100644
--- a/drivers/mtd/nand/core.c
+++ b/drivers/mtd/nand/core.c
@@ -174,6 +174,40 @@ int nanddev_mtd_erase(struct mtd_info *mtd, struct erase_info *einfo)
 EXPORT_SYMBOL_GPL(nanddev_mtd_erase);
 /**
+ * nanddev_mtd_max_bad_blocks() - Get the maximum number of bad eraseblock on
+ *                                a specific region of the NAND device
+ * @mtd: MTD device
+ * @offs: offset of the NAND region
+ * @len: length of the NAND region
+ *
+ * Default implementation for mtd->_max_bad_blocks(). Only works if
+ * nand->memorg.max_bad_eraseblocks_per_lun is > 0.
+ *
+ * Return: a positive number encoding the maximum number of eraseblocks on a
+ * portion of memory, a negative error code otherwise.
+ */
+int nanddev_mtd_max_bad_blocks(struct mtd_info *mtd, loff_t offs, size_t len)
+{
+        struct nand_device *nand = mtd_to_nanddev(mtd);
+        struct nand_pos pos, end;
+        unsigned int max_bb = 0;
+        if (!nand->memorg.max_bad_eraseblocks_per_lun)
+                return -ENOTSUPP;
+        nanddev_offs_to_pos(nand, offs, &pos);
+        nanddev_offs_to_pos(nand, offs + len, &end);
+        for (nanddev_offs_to_pos(nand, offs, &pos);
+             nanddev_pos_cmp(&pos, &end) < 0;
+             nanddev_pos_next_lun(nand, &pos))
+                max_bb += nand->memorg.max_bad_eraseblocks_per_lun;
+        return max_bb;
+}
+EXPORT_SYMBOL_GPL(nanddev_mtd_max_bad_blocks);
+/**
 * nanddev_init() - Initialize a NAND device
 * @nand: NAND device
 * @ops: NAND device operations
diff --git a/drivers/mtd/nand/onenand/onenand_base.c b/drivers/mtd/nand/onenand/onenand_base.c
index 4ca4b194e7d7..f41d76248550 100644
--- a/drivers/mtd/nand/onenand/onenand_base.c
+++ b/drivers/mtd/nand/onenand/onenand_base.c
@@ -2458,7 +2458,7 @@ static int onenand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
                bbm->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1);
        /* We write two bytes, so we don't have to mess with 16-bit access */
-        ofs += mtd->oobsize + (bbm->badblockpos & ~0x01);
+        ofs += mtd->oobsize + (this->badblockpos & ~0x01);
        /* FIXME : What to do when marking SLC block in partition
         *         with MLC erasesize? For now, it is not advisable to
         *         create partitions containing both SLC and MLC regions.
@@ -3967,6 +3967,9 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
        if (!(this->options & ONENAND_SKIP_INITIAL_UNLOCKING))
                this->unlock_all(mtd);
+        /* Set the bad block marker position */
+        this->badblockpos = ONENAND_BADBLOCK_POS;
        ret = this->scan_bbt(mtd);
        if ((!FLEXONENAND(this)) || ret)
                return ret;
diff --git a/drivers/mtd/nand/onenand/onenand_bbt.c b/drivers/mtd/nand/onenand/onenand_bbt.c
index dde20487937d..57c31c81be18 100644
--- a/drivers/mtd/nand/onenand/onenand_bbt.c
+++ b/drivers/mtd/nand/onenand/onenand_bbt.c
@@ -190,9 +190,6 @@ static int onenand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
        if (!bbm->bbt)
                return -ENOMEM;
-        /* Set the bad block position */
-        bbm->badblockpos = ONENAND_BADBLOCK_POS;
        /* Set erase shift */
        bbm->bbt_erase_shift = this->erase_shift;
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index e604625e2dfa..0500c42f31cb 100644
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -1,34 +1,29 @@
-config MTD_NAND_ECC
+config MTD_NAND_ECC_SW_HAMMING
        tristate
-config MTD_NAND_ECC_SMC
+config MTD_NAND_ECC_SW_HAMMING_SMC
        bool "NAND ECC Smart Media byte order"
-        depends on MTD_NAND_ECC
+        depends on MTD_NAND_ECC_SW_HAMMING
        default n
        help
          Software ECC according to the Smart Media Specification.
          The original Linux implementation had byte 0 and 1 swapped.
+menuconfig MTD_RAW_NAND
-menuconfig MTD_NAND
        tristate "Raw/Parallel NAND Device Support"
        depends on MTD
-        select MTD_NAND_ECC
+        select MTD_NAND_CORE
+        select MTD_NAND_ECC_SW_HAMMING
        help
          This enables support for accessing all type of raw/parallel
          NAND flash devices. For further information see
          <http://www.linux-mtd.infradead.org/doc/nand.html>.
-if MTD_NAND
+if MTD_RAW_NAND
-config MTD_NAND_BCH
+config MTD_NAND_ECC_SW_BCH
-        tristate
-        select BCH
-        depends on MTD_NAND_ECC_BCH
-        default MTD_NAND
-config MTD_NAND_ECC_BCH
        bool "Support software BCH ECC"
+        select BCH
        default n
        help
          This enables support for software BCH error correction. Binary BCH
@@ -36,15 +31,13 @@ config MTD_NAND_ECC_BCH
          ECC codes. They are used with NAND devices requiring more than 1 bit
          of error correction.
-config MTD_SM_COMMON
+comment "Raw/parallel NAND flash controllers"
-        tristate
-        default n
 config MTD_NAND_DENALI
        tristate
 config MTD_NAND_DENALI_PCI
-        tristate "Support Denali NAND controller on Intel Moorestown"
+        tristate "Denali NAND controller on Intel Moorestown"
        select MTD_NAND_DENALI
        depends on PCI
        help
@@ -52,31 +45,22 @@ config MTD_NAND_DENALI_PCI
          Denali NAND controller core.
 config MTD_NAND_DENALI_DT
-        tristate "Support Denali NAND controller as a DT device"
+        tristate "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"
+        tristate "Amstrad E3 NAND controller"
        depends on MACH_AMS_DELTA || COMPILE_TEST
        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"
+        tristate "OMAP2, OMAP3, OMAP4 and Keystone NAND controller"
        depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST
        depends on HAS_IOMEM
        help
@@ -98,18 +82,6 @@ config MTD_NAND_OMAP_BCH
 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
@@ -117,8 +89,15 @@ config MTD_NAND_AU1550
          This enables the driver for the NAND flash controller on the
          AMD/Alchemy 1550 SOC.
+config MTD_NAND_NDFC
+        tristate "IBM/MCC 4xx NAND controller"
+        depends on 4xx
+        select MTD_NAND_ECC_SW_HAMMING_SMC
+        help
+          NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
 config MTD_NAND_S3C2410
-        tristate "NAND Flash support for Samsung S3C SoCs"
+        tristate "Samsung S3C NAND controller"
        depends on ARCH_S3C24XX || ARCH_S3C64XX
        help
          This enables the NAND flash controller on the S3C24xx and S3C64xx
@@ -128,18 +107,11 @@ config MTD_NAND_S3C2410
          must advertise a platform_device for the driver to attach.
 config MTD_NAND_S3C2410_DEBUG
-        bool "Samsung S3C NAND driver debug"
+        bool "Samsung S3C NAND controller 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
@@ -151,89 +123,19 @@ config MTD_NAND_S3C2410_CLKSTOP
          approximately 5mA of power when there is nothing happening.
 config MTD_NAND_TANGO
-        tristate "NAND Flash support for Tango chips"
+        tristate "Tango NAND controller"
        depends on ARCH_TANGO || COMPILE_TEST
        depends on HAS_IOMEM
        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_SHARPSL
-        tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
+        tristate "Sharp SL Series (C7xx + others) NAND controller"
        depends on ARCH_PXA || COMPILE_TEST
        depends on HAS_IOMEM
 config MTD_NAND_CAFE
-        tristate "NAND support for OLPC CAFÉ chip"
+        tristate "OLPC CAFÉ NAND controller"
        depends on PCI
        select REED_SOLOMON
        select REED_SOLOMON_DEC16
@@ -242,7 +144,7 @@ config MTD_NAND_CAFE
          laptop.
 config MTD_NAND_CS553X
-        tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
+        tristate "CS5535/CS5536 (AMD Geode companion) NAND controller"
        depends on X86_32
        depends on !UML && HAS_IOMEM
        help
@@ -256,7 +158,7 @@ config MTD_NAND_CS553X
          If you say "m", the module will be called cs553x_nand.
 config MTD_NAND_ATMEL
-        tristate "Support for NAND Flash / SmartMedia on AT91"
+        tristate "Atmel AT91 NAND Flash/SmartMedia NAND controller"
        depends on ARCH_AT91 || COMPILE_TEST
        depends on HAS_IOMEM
        select GENERIC_ALLOCATOR
@@ -265,8 +167,17 @@ config MTD_NAND_ATMEL
          Enables support for NAND Flash / Smart Media Card interface
          on Atmel AT91 processors.
+config MTD_NAND_ORION
+        tristate "Marvell Orion NAND controller"
+        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_MARVELL
-        tristate "NAND controller support on Marvell boards"
+        tristate "Marvell EBU NAND controller"
        depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \
                   COMPILE_TEST
        depends on HAS_IOMEM
@@ -278,7 +189,7 @@ config MTD_NAND_MARVELL
          - 64-bit Aramda platforms (7k, 8k) (NFCv2)
 config MTD_NAND_SLC_LPC32XX
-        tristate "NXP LPC32xx SLC Controller"
+        tristate "NXP LPC32xx SLC NAND controller"
        depends on ARCH_LPC32XX || COMPILE_TEST
        depends on HAS_IOMEM
        help
@@ -290,7 +201,7 @@ config MTD_NAND_SLC_LPC32XX
          by the SLC NAND controller.
 config MTD_NAND_MLC_LPC32XX
-        tristate "NXP LPC32xx MLC Controller"
+        tristate "NXP LPC32xx MLC NAND controller"
        depends on ARCH_LPC32XX || COMPILE_TEST
        depends on HAS_IOMEM
        help
@@ -302,38 +213,23 @@ config MTD_NAND_MLC_LPC32XX
          by the MLC NAND controller.
 config MTD_NAND_CM_X270
-        tristate "Support for NAND Flash on CM-X270 modules"
+        tristate "CM-X270 modules NAND controller"
        depends on MACH_ARMCORE
 config MTD_NAND_PASEMI
-        tristate "NAND support for PA Semi PWRficient"
+        tristate "PA Semi PWRficient NAND controller"
        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"
+        tristate "Toshiba Mobile IO NAND 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 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 || COMPILE_TEST
@@ -344,7 +240,7 @@ config MTD_NAND_BRCMNAND
          BCM3xxx, BCM63xxx, iProc/Cygnus and more.
 config MTD_NAND_BCM47XXNFLASH
-        tristate "Support for NAND flash on BCM4706 BCMA bus"
+        tristate "BCM4706 BCMA NAND controller"
        depends on BCMA_NFLASH
        depends on BCMA
        help
@@ -352,32 +248,31 @@ config MTD_NAND_BCM47XXNFLASH
          registered by bcma as platform devices. This enables driver for
          NAND flash memories. For now only BCM4706 is supported.
-config MTD_NAND_PLATFORM
+config MTD_NAND_OXNAS
-        tristate "Support for generic platform NAND driver"
+        tristate "Oxford Semiconductor NAND controller"
+        depends on ARCH_OXNAS || COMPILE_TEST
        depends on HAS_IOMEM
        help
-          This implements a generic NAND driver for on-SOC platform
+          This enables the NAND flash controller on Oxford Semiconductor SoCs.
-          devices. You will need to provide platform-specific functions
-          via platform_data.
-config MTD_NAND_ORION
+config MTD_NAND_MPC5121_NFC
-        tristate "NAND Flash support for Marvell Orion SoC"
+        tristate "MPC5121 NAND controller"
-        depends on PLAT_ORION
+        depends on PPC_MPC512x
        help
-          This enables the NAND flash controller on Orion machines.
+          This enables the driver for the NAND flash controller on the
+          MPC5121 SoC.
-          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
+config MTD_NAND_GPMI_NAND
-        tristate "NAND Flash support for Oxford Semiconductor SoC"
+        tristate "Freescale GPMI NAND controller"
-        depends on ARCH_OXNAS || COMPILE_TEST
+        depends on MXS_DMA
-        depends on HAS_IOMEM
        help
-          This enables the NAND flash controller on Oxford Semiconductor SoCs.
+          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_FSL_ELBC
-        tristate "NAND support for Freescale eLBC controllers"
+        tristate "Freescale eLBC NAND controller"
        depends on FSL_SOC
        select FSL_LBC
        help
@@ -387,7 +282,7 @@ config MTD_NAND_FSL_ELBC
          external NAND devices.
 config MTD_NAND_FSL_IFC
-        tristate "NAND support for Freescale IFC controller"
+        tristate "Freescale IFC NAND controller"
        depends on FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST
        depends on HAS_IOMEM
        select FSL_IFC
@@ -399,22 +294,15 @@ config MTD_NAND_FSL_IFC
          external NAND devices.
 config MTD_NAND_FSL_UPM
-        tristate "Support for NAND on Freescale UPM"
+        tristate "Freescale UPM NAND controller"
        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"
+        tristate "Freescale VF610/MPC5125 NAND controller"
        depends on (SOC_VF610 || COMPILE_TEST)
        depends on HAS_IOMEM
        help
@@ -426,7 +314,7 @@ config MTD_NAND_VF610_NFC
          device tree.
 config MTD_NAND_MXC
-        tristate "MXC NAND support"
+        tristate "Freescale MXC NAND controller"
        depends on ARCH_MXC || COMPILE_TEST
        depends on HAS_IOMEM
        help
@@ -434,7 +322,7 @@ config MTD_NAND_MXC
          MXC processors.
 config MTD_NAND_SH_FLCTL
-        tristate "Support for NAND on Renesas SuperH FLCTL"
+        tristate "Renesas SuperH FLCTL NAND controller"
        depends on SUPERH || COMPILE_TEST
        depends on HAS_IOMEM
        help
@@ -442,7 +330,7 @@ config MTD_NAND_SH_FLCTL
          for NAND Flash using FLCTL.
 config MTD_NAND_DAVINCI
-        tristate "Support NAND on DaVinci/Keystone SoC"
+        tristate "DaVinci/Keystone NAND controller"
        depends on ARCH_DAVINCI || (ARCH_KEYSTONE && TI_AEMIF) || COMPILE_TEST
        depends on HAS_IOMEM
        help
@@ -450,42 +338,30 @@ config MTD_NAND_DAVINCI
          DaVinci/Keystone processors.
 config MTD_NAND_TXX9NDFMC
-        tristate "NAND Flash support for TXx9 SoC"
+        tristate "TXx9 NAND controller"
        depends on SOC_TX4938 || SOC_TX4939 || COMPILE_TEST
        depends on HAS_IOMEM
        help
          This enables the NAND flash controller on the TXx9 SoCs.
 config MTD_NAND_SOCRATES
-        tristate "Support for NAND on Socrates board"
+        tristate "Socrates NAND controller"
        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."
+        tristate "Nuvoton NUC9xx/w90p910 NAND controller"
        depends on ARCH_W90X900 || COMPILE_TEST
        depends on HAS_IOMEM
        help
          This enables the driver for the NAND Flash on evaluation board based
          on w90p910 / NUC9xx.
-config MTD_NAND_JZ4740
+source "drivers/mtd/nand/raw/ingenic/Kconfig"
-        tristate "Support for JZ4740 SoC NAND controller"
-        depends on MACH_JZ4740 || COMPILE_TEST
-        depends on HAS_IOMEM
-        help
-          Enables support for NAND Flash on JZ4740 SoC based boards.
-config MTD_NAND_JZ4780
-        tristate "Support for NAND on JZ4780 SoC"
-        depends on 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"
+        tristate "ST Micros FSMC NAND controller"
        depends on OF && HAS_IOMEM
        depends on PLAT_SPEAR || ARCH_NOMADIK || ARCH_U8500 || MACH_U300 || \
                   COMPILE_TEST
@@ -494,28 +370,28 @@ config MTD_NAND_FSMC
          Flexible Static Memory Controller (FSMC)
 config MTD_NAND_XWAY
-        bool "Support for NAND on Lantiq XWAY SoC"
+        bool "Lantiq XWAY NAND controller"
        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"
+        tristate "Allwinner NAND controller"
        depends on ARCH_SUNXI || COMPILE_TEST
        depends on HAS_IOMEM
        help
          Enables support for NAND Flash chips on Allwinner SoCs.
 config MTD_NAND_HISI504
-        tristate "Support for NAND controller on Hisilicon SoC Hip04"
+        tristate "Hisilicon Hip04 NAND controller"
        depends on ARCH_HISI || COMPILE_TEST
        depends on HAS_IOMEM
        help
          Enables support for NAND controller on Hisilicon SoC Hip04.
 config MTD_NAND_QCOM
-        tristate "Support for NAND on QCOM SoCs"
+        tristate "QCOM NAND controller"
        depends on ARCH_QCOM || COMPILE_TEST
        depends on HAS_IOMEM
        help
@@ -523,7 +399,7 @@ config MTD_NAND_QCOM
          controller. This controller is found on IPQ806x SoC.
 config MTD_NAND_MTK
-        tristate "Support for NAND controller on MTK SoCs"
+        tristate "MTK NAND controller"
        depends on ARCH_MEDIATEK || COMPILE_TEST
        depends on HAS_IOMEM
        help
@@ -531,7 +407,7 @@ config MTD_NAND_MTK
          This controller is found on mt27xx, mt81xx, mt65xx SoCs.
 config MTD_NAND_TEGRA
-        tristate "Support for NAND controller on NVIDIA Tegra"
+        tristate "NVIDIA Tegra NAND controller"
        depends on ARCH_TEGRA || COMPILE_TEST
        depends on HAS_IOMEM
        help
@@ -558,4 +434,115 @@ config MTD_NAND_MESON
          Enables support for NAND controller on Amlogic's Meson SoCs.
          This controller is found on Meson SoCs.
-endif # MTD_NAND
+config MTD_NAND_GPIO
+        tristate "GPIO assisted NAND controller"
+        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_PLATFORM
+        tristate "Generic NAND controller"
+        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.
+comment "Misc"
+config MTD_SM_COMMON
+        tristate
+        default n
+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_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_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".
+endif # MTD_RAW_NAND
diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile
index 5a5a72f0793e..efaf5cd25edc 100644
--- a/drivers/mtd/nand/raw/Makefile
+++ b/drivers/mtd/nand/raw/Makefile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_MTD_NAND)                  += nand.o
+obj-$(CONFIG_MTD_RAW_NAND)              += nand.o
-obj-$(CONFIG_MTD_NAND_ECC)              += nand_ecc.o
+obj-$(CONFIG_MTD_NAND_ECC_SW_HAMMING)   += nand_ecc.o
-obj-$(CONFIG_MTD_NAND_BCH)              += nand_bch.o
+nand-$(CONFIG_MTD_NAND_ECC_SW_BCH)      += nand_bch.o
 obj-$(CONFIG_MTD_SM_COMMON)             += sm_common.o
 obj-$(CONFIG_MTD_NAND_CAFE)             += cafe_nand.o
@@ -45,8 +45,7 @@ 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-y                                   += ingenic/
-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/
diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index 5781fcf6b76c..8d6be90a6fe8 100644
--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright 2017 ATMEL
 * Copyright 2017 Free Electrons
@@ -29,10 +30,6 @@
 *   Add Nand Flash Controller support for SAMA5 SoC
 *      Copyright 2013 ATMEL, Josh Wu (josh.wu@atmel.com)
 *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 * A few words about the naming convention in this file. This convention
 * applies to structure and function names.
 *
@@ -65,6 +62,7 @@
 #include <linux/iopoll.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <soc/at91/atmel-sfr.h>
 #include "pmecc.h"
@@ -211,6 +209,7 @@ struct atmel_nand_controller_caps {
        bool legacy_of_bindings;
        u32 ale_offs;
        u32 cle_offs;
+        const char *ebi_csa_regmap_name;
        const struct atmel_nand_controller_ops *ops;
 };
@@ -231,10 +230,15 @@ to_nand_controller(struct nand_controller *ctl)
        return container_of(ctl, struct atmel_nand_controller, base);
 }
+struct atmel_smc_nand_ebi_csa_cfg {
+        u32 offs;
+        u32 nfd0_on_d16;
+};
 struct atmel_smc_nand_controller {
        struct atmel_nand_controller base;
-        struct regmap *matrix;
+        struct regmap *ebi_csa_regmap;
-        unsigned int ebi_csa_offs;
+        struct atmel_smc_nand_ebi_csa_cfg *ebi_csa;
 };
 static inline struct atmel_smc_nand_controller *
@@ -1068,15 +1072,15 @@ static int atmel_nand_pmecc_init(struct nand_chip *chip)
                req.ecc.strength = ATMEL_PMECC_MAXIMIZE_ECC_STRENGTH;
        else if (chip->ecc.strength)
                req.ecc.strength = chip->ecc.strength;
-        else if (chip->ecc_strength_ds)
+        else if (chip->base.eccreq.strength)
-                req.ecc.strength = chip->ecc_strength_ds;
+                req.ecc.strength = chip->base.eccreq.strength;
        else
                req.ecc.strength = ATMEL_PMECC_MAXIMIZE_ECC_STRENGTH;
        if (chip->ecc.size)
                req.ecc.sectorsize = chip->ecc.size;
-        else if (chip->ecc_step_ds)
+        else if (chip->base.eccreq.step_size)
-                req.ecc.sectorsize = chip->ecc_step_ds;
+                req.ecc.sectorsize = chip->base.eccreq.step_size;
        else
                req.ecc.sectorsize = ATMEL_PMECC_SECTOR_SIZE_AUTO;
@@ -1507,13 +1511,20 @@ static void atmel_smc_nand_init(struct atmel_nand_controller *nc,
        atmel_nand_init(nc, nand);
        smc_nc = to_smc_nand_controller(chip->controller);
-        if (!smc_nc->matrix)
+        if (!smc_nc->ebi_csa_regmap)
                return;
        /* Attach the CS to the NAND Flash logic. */
        for (i = 0; i < nand->numcs; i++)
-                regmap_update_bits(smc_nc->matrix, smc_nc->ebi_csa_offs,
+                regmap_update_bits(smc_nc->ebi_csa_regmap,
+                                   smc_nc->ebi_csa->offs,
                                   BIT(nand->cs[i].id), BIT(nand->cs[i].id));
+        if (smc_nc->ebi_csa->nfd0_on_d16)
+                regmap_update_bits(smc_nc->ebi_csa_regmap,
+                                   smc_nc->ebi_csa->offs,
+                                   smc_nc->ebi_csa->nfd0_on_d16,
+                                   smc_nc->ebi_csa->nfd0_on_d16);
 }
 static void atmel_hsmc_nand_init(struct atmel_nand_controller *nc,
@@ -1797,7 +1808,7 @@ static int atmel_nand_controller_add_nands(struct atmel_nand_controller *nc)
        ret = of_property_read_u32(np, "#size-cells", &val);
        if (ret) {
-                dev_err(dev, "missing #address-cells property\n");
+                dev_err(dev, "missing #size-cells property\n");
                return ret;
        }
@@ -1833,34 +1844,71 @@ static void atmel_nand_controller_cleanup(struct atmel_nand_controller *nc)
        clk_put(nc->mck);
 }
-static const struct of_device_id atmel_matrix_of_ids[] = {
+static const struct atmel_smc_nand_ebi_csa_cfg at91sam9260_ebi_csa = {
+        .offs = AT91SAM9260_MATRIX_EBICSA,
+};
+static const struct atmel_smc_nand_ebi_csa_cfg at91sam9261_ebi_csa = {
+        .offs = AT91SAM9261_MATRIX_EBICSA,
+};
+static const struct atmel_smc_nand_ebi_csa_cfg at91sam9263_ebi_csa = {
+        .offs = AT91SAM9263_MATRIX_EBI0CSA,
+};
+static const struct atmel_smc_nand_ebi_csa_cfg at91sam9rl_ebi_csa = {
+        .offs = AT91SAM9RL_MATRIX_EBICSA,
+};
+static const struct atmel_smc_nand_ebi_csa_cfg at91sam9g45_ebi_csa = {
+        .offs = AT91SAM9G45_MATRIX_EBICSA,
+};
+static const struct atmel_smc_nand_ebi_csa_cfg at91sam9n12_ebi_csa = {
+        .offs = AT91SAM9N12_MATRIX_EBICSA,
+};
+static const struct atmel_smc_nand_ebi_csa_cfg at91sam9x5_ebi_csa = {
+        .offs = AT91SAM9X5_MATRIX_EBICSA,
+};
+static const struct atmel_smc_nand_ebi_csa_cfg sam9x60_ebi_csa = {
+        .offs = AT91_SFR_CCFG_EBICSA,
+        .nfd0_on_d16 = AT91_SFR_CCFG_NFD0_ON_D16,
+};
+static const struct of_device_id atmel_ebi_csa_regmap_of_ids[] = {
        {
                .compatible = "atmel,at91sam9260-matrix",
-                .data = (void *)AT91SAM9260_MATRIX_EBICSA,
+                .data = &at91sam9260_ebi_csa,
        },
        {
                .compatible = "atmel,at91sam9261-matrix",
-                .data = (void *)AT91SAM9261_MATRIX_EBICSA,
+                .data = &at91sam9261_ebi_csa,
        },
        {
                .compatible = "atmel,at91sam9263-matrix",
-                .data = (void *)AT91SAM9263_MATRIX_EBI0CSA,
+                .data = &at91sam9263_ebi_csa,
        },
        {
                .compatible = "atmel,at91sam9rl-matrix",
-                .data = (void *)AT91SAM9RL_MATRIX_EBICSA,
+                .data = &at91sam9rl_ebi_csa,
        },
        {
                .compatible = "atmel,at91sam9g45-matrix",
-                .data = (void *)AT91SAM9G45_MATRIX_EBICSA,
+                .data = &at91sam9g45_ebi_csa,
        },
        {
                .compatible = "atmel,at91sam9n12-matrix",
-                .data = (void *)AT91SAM9N12_MATRIX_EBICSA,
+                .data = &at91sam9n12_ebi_csa,
        },
        {
                .compatible = "atmel,at91sam9x5-matrix",
-                .data = (void *)AT91SAM9X5_MATRIX_EBICSA,
+                .data = &at91sam9x5_ebi_csa,
+        },
+        {
+                .compatible = "microchip,sam9x60-sfr",
+                .data = &sam9x60_ebi_csa,
        },
        { /* sentinel */ },
 };
@@ -1982,37 +2030,38 @@ atmel_smc_nand_controller_init(struct atmel_smc_nand_controller *nc)
        struct device_node *np;
        int ret;
-        /* We do not retrieve the matrix syscon when parsing old DTs. */
+        /* We do not retrieve the EBICSA regmap when parsing old DTs. */
        if (nc->base.caps->legacy_of_bindings)
                return 0;
-        np = of_parse_phandle(dev->parent->of_node, "atmel,matrix", 0);
+        np = of_parse_phandle(dev->parent->of_node,
+                              nc->base.caps->ebi_csa_regmap_name, 0);
        if (!np)
                return 0;
-        match = of_match_node(atmel_matrix_of_ids, np);
+        match = of_match_node(atmel_ebi_csa_regmap_of_ids, np);
        if (!match) {
                of_node_put(np);
                return 0;
        }
-        nc->matrix = syscon_node_to_regmap(np);
+        nc->ebi_csa_regmap = syscon_node_to_regmap(np);
        of_node_put(np);
-        if (IS_ERR(nc->matrix)) {
+        if (IS_ERR(nc->ebi_csa_regmap)) {
-                ret = PTR_ERR(nc->matrix);
+                ret = PTR_ERR(nc->ebi_csa_regmap);
-                dev_err(dev, "Could not get Matrix regmap (err = %d)\n", ret);
+                dev_err(dev, "Could not get EBICSA regmap (err = %d)\n", ret);
                return ret;
        }
-        nc->ebi_csa_offs = (uintptr_t)match->data;
+        nc->ebi_csa = (struct atmel_smc_nand_ebi_csa_cfg *)match->data;
        /*
         * The at91sam9263 has 2 EBIs, if the NAND controller is under EBI1
-         * add 4 to ->ebi_csa_offs.
+         * add 4 to ->ebi_csa->offs.
         */
        if (of_device_is_compatible(dev->parent->of_node,
                                    "atmel,at91sam9263-ebi1"))
-                nc->ebi_csa_offs += 4;
+                nc->ebi_csa->offs += 4;
        return 0;
 }
@@ -2341,6 +2390,7 @@ static const struct atmel_nand_controller_ops at91rm9200_nc_ops = {
 static const struct atmel_nand_controller_caps atmel_rm9200_nc_caps = {
        .ale_offs = BIT(21),
        .cle_offs = BIT(22),
+        .ebi_csa_regmap_name = "atmel,matrix",
        .ops = &at91rm9200_nc_ops,
 };
@@ -2355,12 +2405,14 @@ static const struct atmel_nand_controller_ops atmel_smc_nc_ops = {
 static const struct atmel_nand_controller_caps atmel_sam9260_nc_caps = {
        .ale_offs = BIT(21),
        .cle_offs = BIT(22),
+        .ebi_csa_regmap_name = "atmel,matrix",
        .ops = &atmel_smc_nc_ops,
 };
 static const struct atmel_nand_controller_caps atmel_sam9261_nc_caps = {
        .ale_offs = BIT(22),
        .cle_offs = BIT(21),
+        .ebi_csa_regmap_name = "atmel,matrix",
        .ops = &atmel_smc_nc_ops,
 };
@@ -2368,6 +2420,15 @@ static const struct atmel_nand_controller_caps atmel_sam9g45_nc_caps = {
        .has_dma = true,
        .ale_offs = BIT(21),
        .cle_offs = BIT(22),
+        .ebi_csa_regmap_name = "atmel,matrix",
+        .ops = &atmel_smc_nc_ops,
+};
+static const struct atmel_nand_controller_caps microchip_sam9x60_nc_caps = {
+        .has_dma = true,
+        .ale_offs = BIT(21),
+        .cle_offs = BIT(22),
+        .ebi_csa_regmap_name = "microchip,sfr",
        .ops = &atmel_smc_nc_ops,
 };
@@ -2415,6 +2476,10 @@ static const struct of_device_id atmel_nand_controller_of_ids[] = {
                .compatible = "atmel,sama5d3-nand-controller",
                .data = &atmel_sama5_nc_caps,
        },
+        {
+                .compatible = "microchip,sam9x60-nand-controller",
+                .data = &microchip_sam9x60_nc_caps,
+        },
        /* Support for old/deprecated bindings: */
        {
                .compatible = "atmel,at91rm9200-nand",
diff --git a/drivers/mtd/nand/raw/atmel/pmecc.c b/drivers/mtd/nand/raw/atmel/pmecc.c
index 9d3997840889..cbb023bf00f7 100644
--- a/drivers/mtd/nand/raw/atmel/pmecc.c
+++ b/drivers/mtd/nand/raw/atmel/pmecc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright 2017 ATMEL
 * Copyright 2017 Free Electrons
@@ -28,10 +29,6 @@
 *   Add Nand Flash Controller support for SAMA5 SoC
 *      Copyright 2013 ATMEL, Josh Wu (josh.wu@atmel.com)
 *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 * The PMECC is an hardware assisted BCH engine, which means part of the
 * ECC algorithm is left to the software. The hardware/software repartition
 * is explained in the "PMECC Controller Functional Description" chapter in
diff --git a/drivers/mtd/nand/raw/atmel/pmecc.h b/drivers/mtd/nand/raw/atmel/pmecc.h
index 808f1be0d6ad..7851c05126cf 100644
--- a/drivers/mtd/nand/raw/atmel/pmecc.h
+++ b/drivers/mtd/nand/raw/atmel/pmecc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * © Copyright 2016 ATMEL
 * © Copyright 2016 Free Electrons
@@ -28,11 +29,6 @@
 *
 *    Add Nand Flash Controller support for SAMA5 SoC
 *        © Copyright 2013 ATMEL, Josh Wu (josh.wu@atmel.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
 */
 #ifndef ATMEL_PMECC_H
diff --git a/drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c b/drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c
index a37cbfe56567..a53ffb3d64b0 100644
--- a/drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c
+++ b/drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c
@@ -428,7 +428,7 @@ int bcm47xxnflash_ops_bcm4706_init(struct bcm47xxnflash *b47n)
        }
        /* Configure FLASH */
-        chipsize = b47n->nand_chip.chipsize >> 20;
+        chipsize = nanddev_target_size(&b47n->nand_chip.base) >> 20;
        tbits = ffs(chipsize); /* find first bit set */
        if (!tbits || tbits != fls(chipsize)) {
                pr_err("Invalid flash size: 0x%lX\n", chipsize);
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 482c6f093f99..ce0b8ffc7812 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -1676,11 +1676,8 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd,
        int page = addr >> chip->page_shift;
        int ret;
-        if (!buf) {
+        if (!buf)
-                buf = chip->data_buf;
+                buf = nand_get_data_buf(chip);
-                /* Invalidate page cache */
-                chip->pagebuf = -1;
-        }
        sas = mtd->oobsize / chip->ecc.steps;
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index 24aeafc67cd4..3102ddbd8abd 100644
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -3,7 +3,7 @@
 * NAND Flash Controller Device Driver
 * Copyright © 2009-2010, Intel Corporation and its suppliers.
 *
- * Copyright (c) 2017 Socionext Inc.
+ * Copyright (c) 2017-2019 Socionext Inc.
 *   Reworked by Masahiro Yamada <yamada.masahiro@socionext.com>
 */
@@ -40,11 +40,16 @@
 #define DENALI_BANK(denali)     ((denali)->active_bank << 24)
 #define DENALI_INVALID_BANK     -1
-#define DENALI_NR_BANKS         4
-static inline struct denali_nand_info *mtd_to_denali(struct mtd_info *mtd)
+static struct denali_chip *to_denali_chip(struct nand_chip *chip)
 {
-        return container_of(mtd_to_nand(mtd), struct denali_nand_info, nand);
+        return container_of(chip, struct denali_chip, chip);
+}
+static struct denali_controller *to_denali_controller(struct nand_chip *chip)
+{
+        return container_of(chip->controller, struct denali_controller,
+                            controller);
 }
 /*
@@ -52,12 +57,12 @@ static inline struct denali_nand_info *mtd_to_denali(struct mtd_info *mtd)
 * type, bank, block, and page address).  The slave data is the actual data to
 * be transferred.  This mode requires 28 bits of address region allocated.
 */
-static u32 denali_direct_read(struct denali_nand_info *denali, u32 addr)
+static u32 denali_direct_read(struct denali_controller *denali, u32 addr)
 {
        return ioread32(denali->host + addr);
 }
-static void denali_direct_write(struct denali_nand_info *denali, u32 addr,
+static void denali_direct_write(struct denali_controller *denali, u32 addr,
                                u32 data)
 {
        iowrite32(data, denali->host + addr);
@@ -69,77 +74,62 @@ static void denali_direct_write(struct denali_nand_info *denali, u32 addr,
 * control information and transferred data are latched by the registers in
 * the translation module.
 */
-static u32 denali_indexed_read(struct denali_nand_info *denali, u32 addr)
+static u32 denali_indexed_read(struct denali_controller *denali, u32 addr)
 {
        iowrite32(addr, denali->host + DENALI_INDEXED_CTRL);
        return ioread32(denali->host + DENALI_INDEXED_DATA);
 }
-static void denali_indexed_write(struct denali_nand_info *denali, u32 addr,
+static void denali_indexed_write(struct denali_controller *denali, u32 addr,
                                 u32 data)
 {
        iowrite32(addr, denali->host + DENALI_INDEXED_CTRL);
        iowrite32(data, denali->host + DENALI_INDEXED_DATA);
 }
-/*
+static void denali_enable_irq(struct denali_controller *denali)
- * Use the configuration feature register to determine the maximum number of
- * banks that the hardware supports.
- */
-static void denali_detect_max_banks(struct denali_nand_info *denali)
-{
-        uint32_t features = ioread32(denali->reg + FEATURES);
-        denali->max_banks = 1 << FIELD_GET(FEATURES__N_BANKS, features);
-        /* the encoding changed from rev 5.0 to 5.1 */
-        if (denali->revision < 0x0501)
-                denali->max_banks <<= 1;
-}
-static void denali_enable_irq(struct denali_nand_info *denali)
 {
        int i;
-        for (i = 0; i < DENALI_NR_BANKS; i++)
+        for (i = 0; i < denali->nbanks; i++)
                iowrite32(U32_MAX, denali->reg + INTR_EN(i));
        iowrite32(GLOBAL_INT_EN_FLAG, denali->reg + GLOBAL_INT_ENABLE);
 }
-static void denali_disable_irq(struct denali_nand_info *denali)
+static void denali_disable_irq(struct denali_controller *denali)
 {
        int i;
-        for (i = 0; i < DENALI_NR_BANKS; i++)
+        for (i = 0; i < denali->nbanks; i++)
                iowrite32(0, denali->reg + INTR_EN(i));
        iowrite32(0, denali->reg + GLOBAL_INT_ENABLE);
 }
-static void denali_clear_irq(struct denali_nand_info *denali,
+static void denali_clear_irq(struct denali_controller *denali,
-                             int bank, uint32_t irq_status)
+                             int bank, u32 irq_status)
 {
        /* write one to clear bits */
        iowrite32(irq_status, denali->reg + INTR_STATUS(bank));
 }
-static void denali_clear_irq_all(struct denali_nand_info *denali)
+static void denali_clear_irq_all(struct denali_controller *denali)
 {
        int i;
-        for (i = 0; i < DENALI_NR_BANKS; i++)
+        for (i = 0; i < denali->nbanks; i++)
                denali_clear_irq(denali, i, U32_MAX);
 }
 static irqreturn_t denali_isr(int irq, void *dev_id)
 {
-        struct denali_nand_info *denali = dev_id;
+        struct denali_controller *denali = dev_id;
        irqreturn_t ret = IRQ_NONE;
-        uint32_t irq_status;
+        u32 irq_status;
        int i;
        spin_lock(&denali->irq_lock);
-        for (i = 0; i < DENALI_NR_BANKS; i++) {
+        for (i = 0; i < denali->nbanks; i++) {
                irq_status = ioread32(denali->reg + INTR_STATUS(i));
                if (irq_status)
                        ret = IRQ_HANDLED;
@@ -160,7 +150,7 @@ static irqreturn_t denali_isr(int irq, void *dev_id)
        return ret;
 }
-static void denali_reset_irq(struct denali_nand_info *denali)
+static void denali_reset_irq(struct denali_controller *denali)
 {
        unsigned long flags;
@@ -170,11 +160,10 @@ static void denali_reset_irq(struct denali_nand_info *denali)
        spin_unlock_irqrestore(&denali->irq_lock, flags);
 }
-static uint32_t denali_wait_for_irq(struct denali_nand_info *denali,
+static u32 denali_wait_for_irq(struct denali_controller *denali, u32 irq_mask)
-                                    uint32_t irq_mask)
 {
        unsigned long time_left, flags;
-        uint32_t irq_status;
+        u32 irq_status;
        spin_lock_irqsave(&denali->irq_lock, flags);
@@ -201,128 +190,259 @@ static uint32_t denali_wait_for_irq(struct denali_nand_info *denali,
        return denali->irq_status;
 }
-static void denali_read_buf(struct nand_chip *chip, uint8_t *buf, int len)
+static void denali_select_target(struct nand_chip *chip, int cs)
 {
+        struct denali_controller *denali = to_denali_controller(chip);
+        struct denali_chip_sel *sel = &to_denali_chip(chip)->sels[cs];
        struct mtd_info *mtd = nand_to_mtd(chip);
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
-        u32 addr = DENALI_MAP11_DATA | DENALI_BANK(denali);
-        int i;
-        for (i = 0; i < len; i++)
+        denali->active_bank = sel->bank;
-                buf[i] = denali->host_read(denali, addr);
+        iowrite32(1 << (chip->phys_erase_shift - chip->page_shift),
+                  denali->reg + PAGES_PER_BLOCK);
+        iowrite32(chip->options & NAND_BUSWIDTH_16 ? 1 : 0,
+                  denali->reg + DEVICE_WIDTH);
+        iowrite32(mtd->writesize, denali->reg + DEVICE_MAIN_AREA_SIZE);
+        iowrite32(mtd->oobsize, denali->reg + DEVICE_SPARE_AREA_SIZE);
+        iowrite32(chip->options & NAND_ROW_ADDR_3 ?
+                  0 : TWO_ROW_ADDR_CYCLES__FLAG,
+                  denali->reg + TWO_ROW_ADDR_CYCLES);
+        iowrite32(FIELD_PREP(ECC_CORRECTION__ERASE_THRESHOLD, 1) |
+                  FIELD_PREP(ECC_CORRECTION__VALUE, chip->ecc.strength),
+                  denali->reg + ECC_CORRECTION);
+        iowrite32(chip->ecc.size, denali->reg + CFG_DATA_BLOCK_SIZE);
+        iowrite32(chip->ecc.size, denali->reg + CFG_LAST_DATA_BLOCK_SIZE);
+        iowrite32(chip->ecc.steps, denali->reg + CFG_NUM_DATA_BLOCKS);
+        if (chip->options & NAND_KEEP_TIMINGS)
+                return;
+        /* update timing registers unless NAND_KEEP_TIMINGS is set */
+        iowrite32(sel->hwhr2_and_we_2_re, denali->reg + TWHR2_AND_WE_2_RE);
+        iowrite32(sel->tcwaw_and_addr_2_data,
+                  denali->reg + TCWAW_AND_ADDR_2_DATA);
+        iowrite32(sel->re_2_we, denali->reg + RE_2_WE);
+        iowrite32(sel->acc_clks, denali->reg + ACC_CLKS);
+        iowrite32(sel->rdwr_en_lo_cnt, denali->reg + RDWR_EN_LO_CNT);
+        iowrite32(sel->rdwr_en_hi_cnt, denali->reg + RDWR_EN_HI_CNT);
+        iowrite32(sel->cs_setup_cnt, denali->reg + CS_SETUP_CNT);
+        iowrite32(sel->re_2_re, denali->reg + RE_2_RE);
 }
-static void denali_write_buf(struct nand_chip *chip, const uint8_t *buf,
+static int denali_change_column(struct nand_chip *chip, unsigned int offset,
-                             int len)
+                                void *buf, unsigned int len, bool write)
 {
-        struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
+        if (write)
-        u32 addr = DENALI_MAP11_DATA | DENALI_BANK(denali);
+                return nand_change_write_column_op(chip, offset, buf, len,
-        int i;
+                                                   false);
+        else
-        for (i = 0; i < len; i++)
+                return nand_change_read_column_op(chip, offset, buf, len,
-                denali->host_write(denali, addr, buf[i]);
+                                                  false);
 }
-static void denali_read_buf16(struct nand_chip *chip, uint8_t *buf, int len)
+static int denali_payload_xfer(struct nand_chip *chip, void *buf, bool write)
 {
-        struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
+        struct denali_controller *denali = to_denali_controller(chip);
-        u32 addr = DENALI_MAP11_DATA | DENALI_BANK(denali);
+        struct mtd_info *mtd = nand_to_mtd(chip);
-        uint16_t *buf16 = (uint16_t *)buf;
+        struct nand_ecc_ctrl *ecc = &chip->ecc;
-        int i;
+        int writesize = mtd->writesize;
+        int oob_skip = denali->oob_skip_bytes;
+        int ret, i, pos, len;
+        for (i = 0; i < ecc->steps; i++) {
+                pos = i * (ecc->size + ecc->bytes);
+                len = ecc->size;
+                if (pos >= writesize) {
+                        pos += oob_skip;
+                } else if (pos + len > writesize) {
+                        /* This chunk overwraps the BBM area. Must be split */
+                        ret = denali_change_column(chip, pos, buf,
+                                                   writesize - pos, write);
+                        if (ret)
+                                return ret;
+                        buf += writesize - pos;
+                        len -= writesize - pos;
+                        pos = writesize + oob_skip;
+                }
+                ret = denali_change_column(chip, pos, buf, len, write);
+                if (ret)
+                        return ret;
-        for (i = 0; i < len / 2; i++)
+                buf += len;
-                buf16[i] = denali->host_read(denali, addr);
+        }
+        return 0;
 }
-static void denali_write_buf16(struct nand_chip *chip, const uint8_t *buf,
+static int denali_oob_xfer(struct nand_chip *chip, void *buf, bool write)
-                               int len)
 {
-        struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
+        struct denali_controller *denali = to_denali_controller(chip);
-        u32 addr = DENALI_MAP11_DATA | DENALI_BANK(denali);
+        struct mtd_info *mtd = nand_to_mtd(chip);
-        const uint16_t *buf16 = (const uint16_t *)buf;
+        struct nand_ecc_ctrl *ecc = &chip->ecc;
-        int i;
+        int writesize = mtd->writesize;
+        int oobsize = mtd->oobsize;
+        int oob_skip = denali->oob_skip_bytes;
+        int ret, i, pos, len;
-        for (i = 0; i < len / 2; i++)
+        /* BBM at the beginning of the OOB area */
-                denali->host_write(denali, addr, buf16[i]);
+        ret = denali_change_column(chip, writesize, buf, oob_skip, write);
+        if (ret)
+                return ret;
+        buf += oob_skip;
+        for (i = 0; i < ecc->steps; i++) {
+                pos = ecc->size + i * (ecc->size + ecc->bytes);
+                if (i == ecc->steps - 1)
+                        /* The last chunk includes OOB free */
+                        len = writesize + oobsize - pos - oob_skip;
+                else
+                        len = ecc->bytes;
+                if (pos >= writesize) {
+                        pos += oob_skip;
+                } else if (pos + len > writesize) {
+                        /* This chunk overwraps the BBM area. Must be split */
+                        ret = denali_change_column(chip, pos, buf,
+                                                   writesize - pos, write);
+                        if (ret)
+                                return ret;
+                        buf += writesize - pos;
+                        len -= writesize - pos;
+                        pos = writesize + oob_skip;
+                }
+                ret = denali_change_column(chip, pos, buf, len, write);
+                if (ret)
+                        return ret;
+                buf += len;
+        }
+        return 0;
 }
-static uint8_t denali_read_byte(struct nand_chip *chip)
+static int denali_read_raw(struct nand_chip *chip, void *buf, void *oob_buf,
+                           int page)
 {
-        uint8_t byte;
+        int ret;
+        if (!buf && !oob_buf)
+                return -EINVAL;
-        denali_read_buf(chip, &byte, 1);
+        ret = nand_read_page_op(chip, page, 0, NULL, 0);
+        if (ret)
+                return ret;
-        return byte;
+        if (buf) {
+                ret = denali_payload_xfer(chip, buf, false);
+                if (ret)
+                        return ret;
+        }
+        if (oob_buf) {
+                ret = denali_oob_xfer(chip, oob_buf, false);
+                if (ret)
+                        return ret;
+        }
+        return 0;
 }
-static void denali_write_byte(struct nand_chip *chip, uint8_t byte)
+static int denali_write_raw(struct nand_chip *chip, const void *buf,
+                            const void *oob_buf, int page)
 {
-        denali_write_buf(chip, &byte, 1);
+        int ret;
+        if (!buf && !oob_buf)
+                return -EINVAL;
+        ret = nand_prog_page_begin_op(chip, page, 0, NULL, 0);
+        if (ret)
+                return ret;
+        if (buf) {
+                ret = denali_payload_xfer(chip, (void *)buf, true);
+                if (ret)
+                        return ret;
+        }
+        if (oob_buf) {
+                ret = denali_oob_xfer(chip, (void *)oob_buf, true);
+                if (ret)
+                        return ret;
+        }
+        return nand_prog_page_end_op(chip);
 }
-static void denali_cmd_ctrl(struct nand_chip *chip, int dat, unsigned int ctrl)
+static int denali_read_page_raw(struct nand_chip *chip, u8 *buf,
+                                int oob_required, int page)
 {
-        struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
+        return denali_read_raw(chip, buf, oob_required ? chip->oob_poi : NULL,
-        uint32_t type;
+                               page);
+}
-        if (ctrl & NAND_CLE)
+static int denali_write_page_raw(struct nand_chip *chip, const u8 *buf,
-                type = DENALI_MAP11_CMD;
+                                 int oob_required, int page)
-        else if (ctrl & NAND_ALE)
+{
-                type = DENALI_MAP11_ADDR;
+        return denali_write_raw(chip, buf, oob_required ? chip->oob_poi : NULL,
-        else
+                                page);
-                return;
+}
-        /*
+static int denali_read_oob(struct nand_chip *chip, int page)
-         * Some commands are followed by chip->legacy.waitfunc.
+{
-         * irq_status must be cleared here to catch the R/B# interrupt later.
+        return denali_read_raw(chip, NULL, chip->oob_poi, page);
-         */
+}
-        if (ctrl & NAND_CTRL_CHANGE)
-                denali_reset_irq(denali);
-        denali->host_write(denali, DENALI_BANK(denali) | type, dat);
+static int denali_write_oob(struct nand_chip *chip, int page)
+{
+        return denali_write_raw(chip, NULL, chip->oob_poi, page);
 }
-static int denali_check_erased_page(struct mtd_info *mtd,
+static int denali_check_erased_page(struct nand_chip *chip, u8 *buf,
-                                    struct nand_chip *chip, uint8_t *buf,
                                    unsigned long uncor_ecc_flags,
                                    unsigned int max_bitflips)
 {
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
+        struct denali_controller *denali = to_denali_controller(chip);
-        uint8_t *ecc_code = chip->oob_poi + denali->oob_skip_bytes;
+        struct mtd_ecc_stats *ecc_stats = &nand_to_mtd(chip)->ecc_stats;
-        int ecc_steps = chip->ecc.steps;
+        struct nand_ecc_ctrl *ecc = &chip->ecc;
-        int ecc_size = chip->ecc.size;
+        u8 *ecc_code = chip->oob_poi + denali->oob_skip_bytes;
-        int ecc_bytes = chip->ecc.bytes;
        int i, stat;
-        for (i = 0; i < ecc_steps; i++) {
+        for (i = 0; i < ecc->steps; i++) {
                if (!(uncor_ecc_flags & BIT(i)))
                        continue;
-                stat = nand_check_erased_ecc_chunk(buf, ecc_size,
+                stat = nand_check_erased_ecc_chunk(buf, ecc->size, ecc_code,
-                                                  ecc_code, ecc_bytes,
+                                                   ecc->bytes, NULL, 0,
-                                                  NULL, 0,
+                                                   ecc->strength);
-                                                  chip->ecc.strength);
                if (stat < 0) {
-                        mtd->ecc_stats.failed++;
+                        ecc_stats->failed++;
                } else {
-                        mtd->ecc_stats.corrected += stat;
+                        ecc_stats->corrected += stat;
                        max_bitflips = max_t(unsigned int, max_bitflips, stat);
                }
-                buf += ecc_size;
+                buf += ecc->size;
-                ecc_code += ecc_bytes;
+                ecc_code += ecc->bytes;
        }
        return max_bitflips;
 }
-static int denali_hw_ecc_fixup(struct mtd_info *mtd,
+static int denali_hw_ecc_fixup(struct nand_chip *chip,
-                               struct denali_nand_info *denali,
                               unsigned long *uncor_ecc_flags)
 {
-        struct nand_chip *chip = mtd_to_nand(mtd);
+        struct denali_controller *denali = to_denali_controller(chip);
+        struct mtd_ecc_stats *ecc_stats = &nand_to_mtd(chip)->ecc_stats;
        int bank = denali->active_bank;
-        uint32_t ecc_cor;
+        u32 ecc_cor;
        unsigned int max_bitflips;
        ecc_cor = ioread32(denali->reg + ECC_COR_INFO(bank));
@@ -346,23 +466,24 @@ static int denali_hw_ecc_fixup(struct mtd_info *mtd,
         * Unfortunately, we can not know the total number of corrected bits in
         * the page.  Increase the stats by max_bitflips. (compromised solution)
         */
-        mtd->ecc_stats.corrected += max_bitflips;
+        ecc_stats->corrected += max_bitflips;
        return max_bitflips;
 }
-static int denali_sw_ecc_fixup(struct mtd_info *mtd,
+static int denali_sw_ecc_fixup(struct nand_chip *chip,
-                               struct denali_nand_info *denali,
+                               unsigned long *uncor_ecc_flags, u8 *buf)
-                               unsigned long *uncor_ecc_flags, uint8_t *buf)
 {
-        unsigned int ecc_size = denali->nand.ecc.size;
+        struct denali_controller *denali = to_denali_controller(chip);
+        struct mtd_ecc_stats *ecc_stats = &nand_to_mtd(chip)->ecc_stats;
+        unsigned int ecc_size = chip->ecc.size;
        unsigned int bitflips = 0;
        unsigned int max_bitflips = 0;
-        uint32_t err_addr, err_cor_info;
+        u32 err_addr, err_cor_info;
        unsigned int err_byte, err_sector, err_device;
-        uint8_t err_cor_value;
+        u8 err_cor_value;
        unsigned int prev_sector = 0;
-        uint32_t irq_status;
+        u32 irq_status;
        denali_reset_irq(denali);
@@ -404,7 +525,7 @@ static int denali_sw_ecc_fixup(struct mtd_info *mtd,
                        /* correct the ECC error */
                        flips_in_byte = hweight8(buf[offset] ^ err_cor_value);
                        buf[offset] ^= err_cor_value;
-                        mtd->ecc_stats.corrected += flips_in_byte;
+                        ecc_stats->corrected += flips_in_byte;
                        bitflips += flips_in_byte;
                        max_bitflips = max(max_bitflips, bitflips);
@@ -424,10 +545,10 @@ static int denali_sw_ecc_fixup(struct mtd_info *mtd,
        return max_bitflips;
 }
-static void denali_setup_dma64(struct denali_nand_info *denali,
+static void denali_setup_dma64(struct denali_controller *denali,
-                               dma_addr_t dma_addr, int page, int write)
+                               dma_addr_t dma_addr, int page, bool write)
 {
-        uint32_t mode;
+        u32 mode;
        const int page_count = 1;
        mode = DENALI_MAP10 | DENALI_BANK(denali) | page;
@@ -439,7 +560,8 @@ static void denali_setup_dma64(struct denali_nand_info *denali,
         *    burst len = 64 bytes, the number of pages
         */
        denali->host_write(denali, mode,
-                           0x01002000 | (64 << 16) | (write << 8) | page_count);
+                           0x01002000 | (64 << 16) |
+                           (write ? BIT(8) : 0) | page_count);
        /* 2. set memory low address */
        denali->host_write(denali, mode, lower_32_bits(dma_addr));
@@ -448,10 +570,10 @@ static void denali_setup_dma64(struct denali_nand_info *denali,
        denali->host_write(denali, mode, upper_32_bits(dma_addr));
 }
-static void denali_setup_dma32(struct denali_nand_info *denali,
+static void denali_setup_dma32(struct denali_controller *denali,
-                               dma_addr_t dma_addr, int page, int write)
+                               dma_addr_t dma_addr, int page, bool write)
 {
-        uint32_t mode;
+        u32 mode;
        const int page_count = 1;
        mode = DENALI_MAP10 | DENALI_BANK(denali);
@@ -460,7 +582,7 @@ static void denali_setup_dma32(struct denali_nand_info *denali,
        /* 1. setup transfer type and # of pages */
        denali->host_write(denali, mode | page,
-                           0x2000 | (write << 8) | page_count);
+                           0x2000 | (write ? BIT(8) : 0) | page_count);
        /* 2. set memory high address bits 23:8 */
        denali->host_write(denali, mode | ((dma_addr >> 16) << 8), 0x2200);
@@ -472,12 +594,11 @@ static void denali_setup_dma32(struct denali_nand_info *denali,
        denali->host_write(denali, mode | 0x14000, 0x2400);
 }
-static int denali_pio_read(struct denali_nand_info *denali, void *buf,
+static int denali_pio_read(struct denali_controller *denali, u32 *buf,
                           size_t size, int page)
 {
        u32 addr = DENALI_MAP01 | DENALI_BANK(denali) | page;
-        uint32_t *buf32 = (uint32_t *)buf;
+        u32 irq_status, ecc_err_mask;
-        uint32_t irq_status, ecc_err_mask;
        int i;
        if (denali->caps & DENALI_CAP_HW_ECC_FIXUP)
@@ -488,7 +609,7 @@ static int denali_pio_read(struct denali_nand_info *denali, void *buf,
        denali_reset_irq(denali);
        for (i = 0; i < size / 4; i++)
-                *buf32++ = denali->host_read(denali, addr);
+                buf[i] = denali->host_read(denali, addr);
        irq_status = denali_wait_for_irq(denali, INTR__PAGE_XFER_INC);
        if (!(irq_status & INTR__PAGE_XFER_INC))
@@ -500,29 +621,29 @@ static int denali_pio_read(struct denali_nand_info *denali, void *buf,
        return irq_status & ecc_err_mask ? -EBADMSG : 0;
 }
-static int denali_pio_write(struct denali_nand_info *denali,
+static int denali_pio_write(struct denali_controller *denali, const u32 *buf,
-                            const void *buf, size_t size, int page)
+                            size_t size, int page)
 {
        u32 addr = DENALI_MAP01 | DENALI_BANK(denali) | page;
-        const uint32_t *buf32 = (uint32_t *)buf;
+        u32 irq_status;
-        uint32_t irq_status;
        int i;
        denali_reset_irq(denali);
        for (i = 0; i < size / 4; i++)
-                denali->host_write(denali, addr, *buf32++);
+                denali->host_write(denali, addr, buf[i]);
        irq_status = denali_wait_for_irq(denali,
-                                INTR__PROGRAM_COMP | INTR__PROGRAM_FAIL);
+                                         INTR__PROGRAM_COMP |
+                                         INTR__PROGRAM_FAIL);
        if (!(irq_status & INTR__PROGRAM_COMP))
                return -EIO;
        return 0;
 }
-static int denali_pio_xfer(struct denali_nand_info *denali, void *buf,
+static int denali_pio_xfer(struct denali_controller *denali, void *buf,
-                           size_t size, int page, int write)
+                           size_t size, int page, bool write)
 {
        if (write)
                return denali_pio_write(denali, buf, size, page);
@@ -530,11 +651,11 @@ static int denali_pio_xfer(struct denali_nand_info *denali, void *buf,
                return denali_pio_read(denali, buf, size, page);
 }
-static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
+static int denali_dma_xfer(struct denali_controller *denali, void *buf,
-                           size_t size, int page, int write)
+                           size_t size, int page, bool write)
 {
        dma_addr_t dma_addr;
-        uint32_t irq_mask, irq_status, ecc_err_mask;
+        u32 irq_mask, irq_status, ecc_err_mask;
        enum dma_data_direction dir = write ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
        int ret = 0;
@@ -587,12 +708,12 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
        return ret;
 }
-static int denali_data_xfer(struct denali_nand_info *denali, void *buf,
+static int denali_page_xfer(struct nand_chip *chip, void *buf, size_t size,
-                            size_t size, int page, int raw, int write)
+                            int page, bool write)
 {
-        iowrite32(raw ? 0 : ECC_ENABLE__FLAG, denali->reg + ECC_ENABLE);
+        struct denali_controller *denali = to_denali_controller(chip);
-        iowrite32(raw ? TRANSFER_SPARE_REG__FLAG : 0,
-                  denali->reg + TRANSFER_SPARE_REG);
+        denali_select_target(chip, chip->cur_cs);
        if (denali->dma_avail)
                return denali_dma_xfer(denali, buf, size, page, write);
@@ -600,180 +721,23 @@ static int denali_data_xfer(struct denali_nand_info *denali, void *buf,
                return denali_pio_xfer(denali, buf, size, page, write);
 }
-static void denali_oob_xfer(struct mtd_info *mtd, struct nand_chip *chip,
+static int denali_read_page(struct nand_chip *chip, u8 *buf,
-                            int page, int write)
-{
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
-        int writesize = mtd->writesize;
-        int oobsize = mtd->oobsize;
-        uint8_t *bufpoi = chip->oob_poi;
-        int ecc_steps = chip->ecc.steps;
-        int ecc_size = chip->ecc.size;
-        int ecc_bytes = chip->ecc.bytes;
-        int oob_skip = denali->oob_skip_bytes;
-        size_t size = writesize + oobsize;
-        int i, pos, len;
-        /* BBM at the beginning of the OOB area */
-        if (write)
-                nand_prog_page_begin_op(chip, page, writesize, bufpoi,
-                                        oob_skip);
-        else
-                nand_read_page_op(chip, page, writesize, bufpoi, oob_skip);
-        bufpoi += oob_skip;
-        /* OOB ECC */
-        for (i = 0; i < ecc_steps; i++) {
-                pos = ecc_size + i * (ecc_size + ecc_bytes);
-                len = ecc_bytes;
-                if (pos >= writesize)
-                        pos += oob_skip;
-                else if (pos + len > writesize)
-                        len = writesize - pos;
-                if (write)
-                        nand_change_write_column_op(chip, pos, bufpoi, len,
-                                                    false);
-                else
-                        nand_change_read_column_op(chip, pos, bufpoi, len,
-                                                   false);
-                bufpoi += len;
-                if (len < ecc_bytes) {
-                        len = ecc_bytes - len;
-                        if (write)
-                                nand_change_write_column_op(chip, writesize +
-                                                            oob_skip, bufpoi,
-                                                            len, false);
-                        else
-                                nand_change_read_column_op(chip, writesize +
-                                                           oob_skip, bufpoi,
-                                                           len, false);
-                        bufpoi += len;
-                }
-        }
-        /* OOB free */
-        len = oobsize - (bufpoi - chip->oob_poi);
-        if (write)
-                nand_change_write_column_op(chip, size - len, bufpoi, len,
-                                            false);
-        else
-                nand_change_read_column_op(chip, size - len, bufpoi, len,
-                                           false);
-}
-static int denali_read_page_raw(struct nand_chip *chip, uint8_t *buf,
-                                int oob_required, int page)
-{
-        struct mtd_info *mtd = nand_to_mtd(chip);
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
-        int writesize = mtd->writesize;
-        int oobsize = mtd->oobsize;
-        int ecc_steps = chip->ecc.steps;
-        int ecc_size = chip->ecc.size;
-        int ecc_bytes = chip->ecc.bytes;
-        void *tmp_buf = denali->buf;
-        int oob_skip = denali->oob_skip_bytes;
-        size_t size = writesize + oobsize;
-        int ret, i, pos, len;
-        ret = denali_data_xfer(denali, tmp_buf, size, page, 1, 0);
-        if (ret)
-                return ret;
-        /* Arrange the buffer for syndrome payload/ecc layout */
-        if (buf) {
-                for (i = 0; i < ecc_steps; i++) {
-                        pos = i * (ecc_size + ecc_bytes);
-                        len = ecc_size;
-                        if (pos >= writesize)
-                                pos += oob_skip;
-                        else if (pos + len > writesize)
-                                len = writesize - pos;
-                        memcpy(buf, tmp_buf + pos, len);
-                        buf += len;
-                        if (len < ecc_size) {
-                                len = ecc_size - len;
-                                memcpy(buf, tmp_buf + writesize + oob_skip,
-                                       len);
-                                buf += len;
-                        }
-                }
-        }
-        if (oob_required) {
-                uint8_t *oob = chip->oob_poi;
-                /* BBM at the beginning of the OOB area */
-                memcpy(oob, tmp_buf + writesize, oob_skip);
-                oob += oob_skip;
-                /* OOB ECC */
-                for (i = 0; i < ecc_steps; i++) {
-                        pos = ecc_size + i * (ecc_size + ecc_bytes);
-                        len = ecc_bytes;
-                        if (pos >= writesize)
-                                pos += oob_skip;
-                        else if (pos + len > writesize)
-                                len = writesize - pos;
-                        memcpy(oob, tmp_buf + pos, len);
-                        oob += len;
-                        if (len < ecc_bytes) {
-                                len = ecc_bytes - len;
-                                memcpy(oob, tmp_buf + writesize + oob_skip,
-                                       len);
-                                oob += len;
-                        }
-                }
-                /* OOB free */
-                len = oobsize - (oob - chip->oob_poi);
-                memcpy(oob, tmp_buf + size - len, len);
-        }
-        return 0;
-}
-static int denali_read_oob(struct nand_chip *chip, int page)
-{
-        struct mtd_info *mtd = nand_to_mtd(chip);
-        denali_oob_xfer(mtd, chip, page, 0);
-        return 0;
-}
-static int denali_write_oob(struct nand_chip *chip, int page)
-{
-        struct mtd_info *mtd = nand_to_mtd(chip);
-        denali_oob_xfer(mtd, chip, page, 1);
-        return nand_prog_page_end_op(chip);
-}
-static int denali_read_page(struct nand_chip *chip, uint8_t *buf,
                            int oob_required, int page)
 {
+        struct denali_controller *denali = to_denali_controller(chip);
        struct mtd_info *mtd = nand_to_mtd(chip);
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
        unsigned long uncor_ecc_flags = 0;
        int stat = 0;
        int ret;
-        ret = denali_data_xfer(denali, buf, mtd->writesize, page, 0, 0);
+        ret = denali_page_xfer(chip, buf, mtd->writesize, page, false);
        if (ret && ret != -EBADMSG)
                return ret;
        if (denali->caps & DENALI_CAP_HW_ECC_FIXUP)
-                stat = denali_hw_ecc_fixup(mtd, denali, &uncor_ecc_flags);
+                stat = denali_hw_ecc_fixup(chip, &uncor_ecc_flags);
        else if (ret == -EBADMSG)
-                stat = denali_sw_ecc_fixup(mtd, denali, &uncor_ecc_flags, buf);
+                stat = denali_sw_ecc_fixup(chip, &uncor_ecc_flags, buf);
        if (stat < 0)
                return stat;
@@ -783,130 +747,32 @@ static int denali_read_page(struct nand_chip *chip, uint8_t *buf,
                if (ret)
                        return ret;
-                stat = denali_check_erased_page(mtd, chip, buf,
+                stat = denali_check_erased_page(chip, buf,
                                                uncor_ecc_flags, stat);
        }
        return stat;
 }
-static int denali_write_page_raw(struct nand_chip *chip, const uint8_t *buf,
+static int denali_write_page(struct nand_chip *chip, const u8 *buf,
-                                 int oob_required, int page)
-{
-        struct mtd_info *mtd = nand_to_mtd(chip);
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
-        int writesize = mtd->writesize;
-        int oobsize = mtd->oobsize;
-        int ecc_steps = chip->ecc.steps;
-        int ecc_size = chip->ecc.size;
-        int ecc_bytes = chip->ecc.bytes;
-        void *tmp_buf = denali->buf;
-        int oob_skip = denali->oob_skip_bytes;
-        size_t size = writesize + oobsize;
-        int i, pos, len;
-        /*
-         * Fill the buffer with 0xff first except the full page transfer.
-         * This simplifies the logic.
-         */
-        if (!buf || !oob_required)
-                memset(tmp_buf, 0xff, size);
-        /* Arrange the buffer for syndrome payload/ecc layout */
-        if (buf) {
-                for (i = 0; i < ecc_steps; i++) {
-                        pos = i * (ecc_size + ecc_bytes);
-                        len = ecc_size;
-                        if (pos >= writesize)
-                                pos += oob_skip;
-                        else if (pos + len > writesize)
-                                len = writesize - pos;
-                        memcpy(tmp_buf + pos, buf, len);
-                        buf += len;
-                        if (len < ecc_size) {
-                                len = ecc_size - len;
-                                memcpy(tmp_buf + writesize + oob_skip, buf,
-                                       len);
-                                buf += len;
-                        }
-                }
-        }
-        if (oob_required) {
-                const uint8_t *oob = chip->oob_poi;
-                /* BBM at the beginning of the OOB area */
-                memcpy(tmp_buf + writesize, oob, oob_skip);
-                oob += oob_skip;
-                /* OOB ECC */
-                for (i = 0; i < ecc_steps; i++) {
-                        pos = ecc_size + i * (ecc_size + ecc_bytes);
-                        len = ecc_bytes;
-                        if (pos >= writesize)
-                                pos += oob_skip;
-                        else if (pos + len > writesize)
-                                len = writesize - pos;
-                        memcpy(tmp_buf + pos, oob, len);
-                        oob += len;
-                        if (len < ecc_bytes) {
-                                len = ecc_bytes - len;
-                                memcpy(tmp_buf + writesize + oob_skip, oob,
-                                       len);
-                                oob += len;
-                        }
-                }
-                /* OOB free */
-                len = oobsize - (oob - chip->oob_poi);
-                memcpy(tmp_buf + size - len, oob, len);
-        }
-        return denali_data_xfer(denali, tmp_buf, size, page, 1, 1);
-}
-static int denali_write_page(struct nand_chip *chip, const uint8_t *buf,
                             int oob_required, int page)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
-        return denali_data_xfer(denali, (void *)buf, mtd->writesize,
+        return denali_page_xfer(chip, (void *)buf, mtd->writesize, page, true);
-                                page, 0, 1);
-}
-static void denali_select_chip(struct nand_chip *chip, int cs)
-{
-        struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
-        denali->active_bank = cs;
-}
-static int denali_waitfunc(struct nand_chip *chip)
-{
-        struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
-        uint32_t irq_status;
-        /* R/B# pin transitioned from low to high? */
-        irq_status = denali_wait_for_irq(denali, INTR__INT_ACT);
-        return irq_status & INTR__INT_ACT ? 0 : NAND_STATUS_FAIL;
 }
 static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
                                       const struct nand_data_interface *conf)
 {
-        struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
+        struct denali_controller *denali = to_denali_controller(chip);
+        struct denali_chip_sel *sel;
        const struct nand_sdr_timings *timings;
        unsigned long t_x, mult_x;
        int acc_clks, re_2_we, re_2_re, we_2_re, addr_2_data;
        int rdwr_en_lo, rdwr_en_hi, rdwr_en_lo_hi, cs_setup;
        int addr_2_data_mask;
-        uint32_t tmp;
+        u32 tmp;
        timings = nand_get_sdr_timings(conf);
        if (IS_ERR(timings))
@@ -929,6 +795,8 @@ static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
        if (chipnr == NAND_DATA_IFACE_CHECK_ONLY)
                return 0;
+        sel = &to_denali_chip(chip)->sels[chipnr];
        /* tREA -> ACC_CLKS */
        acc_clks = DIV_ROUND_UP(timings->tREA_max, t_x);
        acc_clks = min_t(int, acc_clks, ACC_CLKS__VALUE);
@@ -936,7 +804,7 @@ static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
        tmp = ioread32(denali->reg + ACC_CLKS);
        tmp &= ~ACC_CLKS__VALUE;
        tmp |= FIELD_PREP(ACC_CLKS__VALUE, acc_clks);
-        iowrite32(tmp, denali->reg + ACC_CLKS);
+        sel->acc_clks = tmp;
        /* tRWH -> RE_2_WE */
        re_2_we = DIV_ROUND_UP(timings->tRHW_min, t_x);
@@ -945,7 +813,7 @@ static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
        tmp = ioread32(denali->reg + RE_2_WE);
        tmp &= ~RE_2_WE__VALUE;
        tmp |= FIELD_PREP(RE_2_WE__VALUE, re_2_we);
-        iowrite32(tmp, denali->reg + RE_2_WE);
+        sel->re_2_we = tmp;
        /* tRHZ -> RE_2_RE */
        re_2_re = DIV_ROUND_UP(timings->tRHZ_max, t_x);
@@ -954,7 +822,7 @@ static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
        tmp = ioread32(denali->reg + RE_2_RE);
        tmp &= ~RE_2_RE__VALUE;
        tmp |= FIELD_PREP(RE_2_RE__VALUE, re_2_re);
-        iowrite32(tmp, denali->reg + RE_2_RE);
+        sel->re_2_re = tmp;
        /*
         * tCCS, tWHR -> WE_2_RE
@@ -968,7 +836,7 @@ static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
        tmp = ioread32(denali->reg + TWHR2_AND_WE_2_RE);
        tmp &= ~TWHR2_AND_WE_2_RE__WE_2_RE;
        tmp |= FIELD_PREP(TWHR2_AND_WE_2_RE__WE_2_RE, we_2_re);
-        iowrite32(tmp, denali->reg + TWHR2_AND_WE_2_RE);
+        sel->hwhr2_and_we_2_re = tmp;
        /* tADL -> ADDR_2_DATA */
@@ -983,7 +851,7 @@ static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
        tmp = ioread32(denali->reg + TCWAW_AND_ADDR_2_DATA);
        tmp &= ~TCWAW_AND_ADDR_2_DATA__ADDR_2_DATA;
        tmp |= FIELD_PREP(TCWAW_AND_ADDR_2_DATA__ADDR_2_DATA, addr_2_data);
-        iowrite32(tmp, denali->reg + TCWAW_AND_ADDR_2_DATA);
+        sel->tcwaw_and_addr_2_data = tmp;
        /* tREH, tWH -> RDWR_EN_HI_CNT */
        rdwr_en_hi = DIV_ROUND_UP(max(timings->tREH_min, timings->tWH_min),
@@ -993,7 +861,7 @@ static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
        tmp = ioread32(denali->reg + RDWR_EN_HI_CNT);
        tmp &= ~RDWR_EN_HI_CNT__VALUE;
        tmp |= FIELD_PREP(RDWR_EN_HI_CNT__VALUE, rdwr_en_hi);
-        iowrite32(tmp, denali->reg + RDWR_EN_HI_CNT);
+        sel->rdwr_en_hi_cnt = tmp;
        /* tRP, tWP -> RDWR_EN_LO_CNT */
        rdwr_en_lo = DIV_ROUND_UP(max(timings->tRP_min, timings->tWP_min), t_x);
@@ -1006,7 +874,7 @@ static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
        tmp = ioread32(denali->reg + RDWR_EN_LO_CNT);
        tmp &= ~RDWR_EN_LO_CNT__VALUE;
        tmp |= FIELD_PREP(RDWR_EN_LO_CNT__VALUE, rdwr_en_lo);
-        iowrite32(tmp, denali->reg + RDWR_EN_LO_CNT);
+        sel->rdwr_en_lo_cnt = tmp;
        /* tCS, tCEA -> CS_SETUP_CNT */
        cs_setup = max3((int)DIV_ROUND_UP(timings->tCS_min, t_x) - rdwr_en_lo,
@@ -1017,39 +885,11 @@ static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
        tmp = ioread32(denali->reg + CS_SETUP_CNT);
        tmp &= ~CS_SETUP_CNT__VALUE;
        tmp |= FIELD_PREP(CS_SETUP_CNT__VALUE, cs_setup);
-        iowrite32(tmp, denali->reg + CS_SETUP_CNT);
+        sel->cs_setup_cnt = tmp;
        return 0;
 }
-static void denali_hw_init(struct denali_nand_info *denali)
-{
-        /*
-         * The REVISION register may not be reliable.  Platforms are allowed to
-         * override it.
-         */
-        if (!denali->revision)
-                denali->revision = swab16(ioread32(denali->reg + REVISION));
-        /*
-         * Set how many bytes should be skipped before writing data in OOB.
-         * If a non-zero value has already been set (by firmware or something),
-         * just use it.  Otherwise, set the driver default.
-         */
-        denali->oob_skip_bytes = ioread32(denali->reg + SPARE_AREA_SKIP_BYTES);
-        if (!denali->oob_skip_bytes) {
-                denali->oob_skip_bytes = DENALI_DEFAULT_OOB_SKIP_BYTES;
-                iowrite32(denali->oob_skip_bytes,
-                          denali->reg + SPARE_AREA_SKIP_BYTES);
-        }
-        denali_detect_max_banks(denali);
-        iowrite32(0x0F, denali->reg + RB_PIN_ENABLED);
-        iowrite32(CHIP_EN_DONT_CARE__FLAG, denali->reg + CHIP_ENABLE_DONT_CARE);
-        iowrite32(0xffff, denali->reg + SPARE_AREA_MARKER);
-}
 int denali_calc_ecc_bytes(int step_size, int strength)
 {
        /* BCH code.  Denali requires ecc.bytes to be multiple of 2 */
@@ -1060,10 +900,10 @@ EXPORT_SYMBOL(denali_calc_ecc_bytes);
 static int denali_ooblayout_ecc(struct mtd_info *mtd, int section,
                                struct mtd_oob_region *oobregion)
 {
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
        struct nand_chip *chip = mtd_to_nand(mtd);
+        struct denali_controller *denali = to_denali_controller(chip);
-        if (section)
+        if (section > 0)
                return -ERANGE;
        oobregion->offset = denali->oob_skip_bytes;
@@ -1075,10 +915,10 @@ static int denali_ooblayout_ecc(struct mtd_info *mtd, int section,
 static int denali_ooblayout_free(struct mtd_info *mtd, int section,
                                 struct mtd_oob_region *oobregion)
 {
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
        struct nand_chip *chip = mtd_to_nand(mtd);
+        struct denali_controller *denali = to_denali_controller(chip);
-        if (section)
+        if (section > 0)
                return -ERANGE;
        oobregion->offset = chip->ecc.total + denali->oob_skip_bytes;
@@ -1092,10 +932,13 @@ static const struct mtd_ooblayout_ops denali_ooblayout_ops = {
        .free = denali_ooblayout_free,
 };
-static int denali_multidev_fixup(struct denali_nand_info *denali)
+static int denali_multidev_fixup(struct nand_chip *chip)
 {
-        struct nand_chip *chip = &denali->nand;
+        struct denali_controller *denali = to_denali_controller(chip);
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
+        memorg = nanddev_get_memorg(&chip->base);
        /*
         * Support for multi device:
@@ -1125,11 +968,12 @@ static int denali_multidev_fixup(struct denali_nand_info *denali)
        }
        /* 2 chips in parallel */
+        memorg->pagesize <<= 1;
+        memorg->oobsize <<= 1;
        mtd->size <<= 1;
        mtd->erasesize <<= 1;
        mtd->writesize <<= 1;
        mtd->oobsize <<= 1;
-        chip->chipsize <<= 1;
        chip->page_shift += 1;
        chip->phys_erase_shift += 1;
        chip->bbt_erase_shift += 1;
@@ -1145,38 +989,10 @@ static int denali_multidev_fixup(struct denali_nand_info *denali)
 static int denali_attach_chip(struct nand_chip *chip)
 {
+        struct denali_controller *denali = to_denali_controller(chip);
        struct mtd_info *mtd = nand_to_mtd(chip);
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
        int ret;
-        if (ioread32(denali->reg + FEATURES) & FEATURES__DMA)
-                denali->dma_avail = 1;
-        if (denali->dma_avail) {
-                int dma_bit = denali->caps & DENALI_CAP_DMA_64BIT ? 64 : 32;
-                ret = dma_set_mask(denali->dev, DMA_BIT_MASK(dma_bit));
-                if (ret) {
-                        dev_info(denali->dev,
-                                 "Failed to set DMA mask. Disabling DMA.\n");
-                        denali->dma_avail = 0;
-                }
-        }
-        if (denali->dma_avail) {
-                chip->options |= NAND_USE_BOUNCE_BUFFER;
-                chip->buf_align = 16;
-                if (denali->caps & DENALI_CAP_DMA_64BIT)
-                        denali->setup_dma = denali_setup_dma64;
-                else
-                        denali->setup_dma = denali_setup_dma32;
-        }
-        chip->bbt_options |= NAND_BBT_USE_FLASH;
-        chip->bbt_options |= NAND_BBT_NO_OOB;
-        chip->ecc.mode = NAND_ECC_HW_SYNDROME;
-        chip->options |= NAND_NO_SUBPAGE_WRITE;
        ret = nand_ecc_choose_conf(chip, denali->ecc_caps,
                                   mtd->oobsize - denali->oob_skip_bytes);
        if (ret) {
@@ -1188,123 +1004,230 @@ static int denali_attach_chip(struct nand_chip *chip)
                "chosen ECC settings: step=%d, strength=%d, bytes=%d\n",
                chip->ecc.size, chip->ecc.strength, chip->ecc.bytes);
-        iowrite32(FIELD_PREP(ECC_CORRECTION__ERASE_THRESHOLD, 1) |
+        ret = denali_multidev_fixup(chip);
-                  FIELD_PREP(ECC_CORRECTION__VALUE, chip->ecc.strength),
+        if (ret)
-                  denali->reg + ECC_CORRECTION);
+                return ret;
-        iowrite32(mtd->erasesize / mtd->writesize,
-                  denali->reg + PAGES_PER_BLOCK);
-        iowrite32(chip->options & NAND_BUSWIDTH_16 ? 1 : 0,
-                  denali->reg + DEVICE_WIDTH);
-        iowrite32(chip->options & NAND_ROW_ADDR_3 ? 0 : TWO_ROW_ADDR_CYCLES__FLAG,
-                  denali->reg + TWO_ROW_ADDR_CYCLES);
-        iowrite32(mtd->writesize, denali->reg + DEVICE_MAIN_AREA_SIZE);
-        iowrite32(mtd->oobsize, denali->reg + DEVICE_SPARE_AREA_SIZE);
-        iowrite32(chip->ecc.size, denali->reg + CFG_DATA_BLOCK_SIZE);
+        return 0;
-        iowrite32(chip->ecc.size, denali->reg + CFG_LAST_DATA_BLOCK_SIZE);
+}
-        /* chip->ecc.steps is set by nand_scan_tail(); not available here */
-        iowrite32(mtd->writesize / chip->ecc.size,
-                  denali->reg + CFG_NUM_DATA_BLOCKS);
-        mtd_set_ooblayout(mtd, &denali_ooblayout_ops);
+static void denali_exec_in8(struct denali_controller *denali, u32 type,
+                            u8 *buf, unsigned int len)
+{
+        int i;
-        if (chip->options & NAND_BUSWIDTH_16) {
+        for (i = 0; i < len; i++)
-                chip->legacy.read_buf = denali_read_buf16;
+                buf[i] = denali->host_read(denali, type | DENALI_BANK(denali));
-                chip->legacy.write_buf = denali_write_buf16;
+}
-        } else {
-                chip->legacy.read_buf = denali_read_buf;
+static void denali_exec_in16(struct denali_controller *denali, u32 type,
-                chip->legacy.write_buf = denali_write_buf;
+                             u8 *buf, unsigned int len)
+{
+        u32 data;
+        int i;
+        for (i = 0; i < len; i += 2) {
+                data = denali->host_read(denali, type | DENALI_BANK(denali));
+                /* bit 31:24 and 15:8 are used for DDR */
+                buf[i] = data;
+                buf[i + 1] = data >> 16;
        }
-        chip->ecc.read_page = denali_read_page;
+}
-        chip->ecc.read_page_raw = denali_read_page_raw;
-        chip->ecc.write_page = denali_write_page;
-        chip->ecc.write_page_raw = denali_write_page_raw;
-        chip->ecc.read_oob = denali_read_oob;
-        chip->ecc.write_oob = denali_write_oob;
-        ret = denali_multidev_fixup(denali);
+static void denali_exec_in(struct denali_controller *denali, u32 type,
-        if (ret)
+                           u8 *buf, unsigned int len, bool width16)
-                return ret;
+{
+        if (width16)
+                denali_exec_in16(denali, type, buf, len);
+        else
+                denali_exec_in8(denali, type, buf, len);
+}
-        /*
+static void denali_exec_out8(struct denali_controller *denali, u32 type,
-         * This buffer is DMA-mapped by denali_{read,write}_page_raw.  Do not
+                             const u8 *buf, unsigned int len)
-         * use devm_kmalloc() because the memory allocated by devm_ does not
+{
-         * guarantee DMA-safe alignment.
+        int i;
-         */
-        denali->buf = kmalloc(mtd->writesize + mtd->oobsize, GFP_KERNEL);
-        if (!denali->buf)
-                return -ENOMEM;
-        return 0;
+        for (i = 0; i < len; i++)
+                denali->host_write(denali, type | DENALI_BANK(denali), buf[i]);
 }
-static void denali_detach_chip(struct nand_chip *chip)
+static void denali_exec_out16(struct denali_controller *denali, u32 type,
+                              const u8 *buf, unsigned int len)
 {
-        struct mtd_info *mtd = nand_to_mtd(chip);
+        int i;
-        struct denali_nand_info *denali = mtd_to_denali(mtd);
+        for (i = 0; i < len; i += 2)
+                denali->host_write(denali, type | DENALI_BANK(denali),
+                                   buf[i + 1] << 16 | buf[i]);
+}
-        kfree(denali->buf);
+static void denali_exec_out(struct denali_controller *denali, u32 type,
+                            const u8 *buf, unsigned int len, bool width16)
+{
+        if (width16)
+                denali_exec_out16(denali, type, buf, len);
+        else
+                denali_exec_out8(denali, type, buf, len);
+}
+static int denali_exec_waitrdy(struct denali_controller *denali)
+{
+        u32 irq_stat;
+        /* R/B# pin transitioned from low to high? */
+        irq_stat = denali_wait_for_irq(denali, INTR__INT_ACT);
+        /* Just in case nand_operation has multiple NAND_OP_WAITRDY_INSTR. */
+        denali_reset_irq(denali);
+        return irq_stat & INTR__INT_ACT ? 0 : -EIO;
+}
+static int denali_exec_instr(struct nand_chip *chip,
+                             const struct nand_op_instr *instr)
+{
+        struct denali_controller *denali = to_denali_controller(chip);
+        switch (instr->type) {
+        case NAND_OP_CMD_INSTR:
+                denali_exec_out8(denali, DENALI_MAP11_CMD,
+                                 &instr->ctx.cmd.opcode, 1);
+                return 0;
+        case NAND_OP_ADDR_INSTR:
+                denali_exec_out8(denali, DENALI_MAP11_ADDR,
+                                 instr->ctx.addr.addrs,
+                                 instr->ctx.addr.naddrs);
+                return 0;
+        case NAND_OP_DATA_IN_INSTR:
+                denali_exec_in(denali, DENALI_MAP11_DATA,
+                               instr->ctx.data.buf.in,
+                               instr->ctx.data.len,
+                               !instr->ctx.data.force_8bit &&
+                               chip->options & NAND_BUSWIDTH_16);
+                return 0;
+        case NAND_OP_DATA_OUT_INSTR:
+                denali_exec_out(denali, DENALI_MAP11_DATA,
+                                instr->ctx.data.buf.out,
+                                instr->ctx.data.len,
+                                !instr->ctx.data.force_8bit &&
+                                chip->options & NAND_BUSWIDTH_16);
+                return 0;
+        case NAND_OP_WAITRDY_INSTR:
+                return denali_exec_waitrdy(denali);
+        default:
+                WARN_ONCE(1, "unsupported NAND instruction type: %d\n",
+                          instr->type);
+                return -EINVAL;
+        }
+}
+static int denali_exec_op(struct nand_chip *chip,
+                          const struct nand_operation *op, bool check_only)
+{
+        int i, ret;
+        if (check_only)
+                return 0;
+        denali_select_target(chip, op->cs);
+        /*
+         * Some commands contain NAND_OP_WAITRDY_INSTR.
+         * irq must be cleared here to catch the R/B# interrupt there.
+         */
+        denali_reset_irq(to_denali_controller(chip));
+        for (i = 0; i < op->ninstrs; i++) {
+                ret = denali_exec_instr(chip, &op->instrs[i]);
+                if (ret)
+                        return ret;
+        }
+        return 0;
 }
 static const struct nand_controller_ops denali_controller_ops = {
        .attach_chip = denali_attach_chip,
-        .detach_chip = denali_detach_chip,
+        .exec_op = denali_exec_op,
        .setup_data_interface = denali_setup_data_interface,
 };
-int denali_init(struct denali_nand_info *denali)
+int denali_chip_init(struct denali_controller *denali,
+                     struct denali_chip *dchip)
 {
-        struct nand_chip *chip = &denali->nand;
+        struct nand_chip *chip = &dchip->chip;
        struct mtd_info *mtd = nand_to_mtd(chip);
-        u32 features = ioread32(denali->reg + FEATURES);
+        struct denali_chip *dchip2;
-        int ret;
+        int i, j, ret;
-        mtd->dev.parent = denali->dev;
+        chip->controller = &denali->controller;
-        denali_hw_init(denali);
-        init_completion(&denali->complete);
+        /* sanity checks for bank numbers */
-        spin_lock_init(&denali->irq_lock);
+        for (i = 0; i < dchip->nsels; i++) {
+                unsigned int bank = dchip->sels[i].bank;
-        denali_clear_irq_all(denali);
+                if (bank >= denali->nbanks) {
+                        dev_err(denali->dev, "unsupported bank %d\n", bank);
+                        return -EINVAL;
+                }
-        ret = devm_request_irq(denali->dev, denali->irq, denali_isr,
+                for (j = 0; j < i; j++) {
-                               IRQF_SHARED, DENALI_NAND_NAME, denali);
+                        if (bank == dchip->sels[j].bank) {
-        if (ret) {
+                                dev_err(denali->dev,
-                dev_err(denali->dev, "Unable to request IRQ\n");
+                                        "bank %d is assigned twice in the same chip\n",
-                return ret;
+                                        bank);
-        }
+                                return -EINVAL;
+                        }
+                }
-        denali_enable_irq(denali);
+                list_for_each_entry(dchip2, &denali->chips, node) {
+                        for (j = 0; j < dchip2->nsels; j++) {
+                                if (bank == dchip2->sels[j].bank) {
+                                        dev_err(denali->dev,
+                                                "bank %d is already used\n",
+                                                bank);
+                                        return -EINVAL;
+                                }
+                        }
+                }
+        }
-        denali->active_bank = DENALI_INVALID_BANK;
+        mtd->dev.parent = denali->dev;
-        nand_set_flash_node(chip, denali->dev->of_node);
+        /*
-        /* Fallback to the default name if DT did not give "label" property */
+         * Fallback to the default name if DT did not give "label" property.
-        if (!mtd->name)
+         * Use "label" property if multiple chips are connected.
+         */
+        if (!mtd->name && list_empty(&denali->chips))
                mtd->name = "denali-nand";
-        chip->legacy.select_chip = denali_select_chip;
+        if (denali->dma_avail) {
-        chip->legacy.read_byte = denali_read_byte;
+                chip->options |= NAND_USE_BOUNCE_BUFFER;
-        chip->legacy.write_byte = denali_write_byte;
+                chip->buf_align = 16;
-        chip->legacy.cmd_ctrl = denali_cmd_ctrl;
-        chip->legacy.waitfunc = denali_waitfunc;
-        if (features & FEATURES__INDEX_ADDR) {
-                denali->host_read = denali_indexed_read;
-                denali->host_write = denali_indexed_write;
-        } else {
-                denali->host_read = denali_direct_read;
-                denali->host_write = denali_direct_write;
        }
        /* clk rate info is needed for setup_data_interface */
        if (!denali->clk_rate || !denali->clk_x_rate)
                chip->options |= NAND_KEEP_TIMINGS;
-        chip->legacy.dummy_controller.ops = &denali_controller_ops;
+        chip->bbt_options |= NAND_BBT_USE_FLASH;
-        ret = nand_scan(chip, denali->max_banks);
+        chip->bbt_options |= NAND_BBT_NO_OOB;
+        chip->options |= NAND_NO_SUBPAGE_WRITE;
+        chip->ecc.mode = NAND_ECC_HW_SYNDROME;
+        chip->ecc.read_page = denali_read_page;
+        chip->ecc.write_page = denali_write_page;
+        chip->ecc.read_page_raw = denali_read_page_raw;
+        chip->ecc.write_page_raw = denali_write_page_raw;
+        chip->ecc.read_oob = denali_read_oob;
+        chip->ecc.write_oob = denali_write_oob;
+        mtd_set_ooblayout(mtd, &denali_ooblayout_ops);
+        ret = nand_scan(chip, dchip->nsels);
        if (ret)
-                goto disable_irq;
+                return ret;
        ret = mtd_device_register(mtd, NULL, 0);
        if (ret) {
@@ -1312,20 +1235,111 @@ int denali_init(struct denali_nand_info *denali)
                goto cleanup_nand;
        }
+        list_add_tail(&dchip->node, &denali->chips);
        return 0;
 cleanup_nand:
        nand_cleanup(chip);
-disable_irq:
-        denali_disable_irq(denali);
        return ret;
 }
+EXPORT_SYMBOL_GPL(denali_chip_init);
+int denali_init(struct denali_controller *denali)
+{
+        u32 features = ioread32(denali->reg + FEATURES);
+        int ret;
+        nand_controller_init(&denali->controller);
+        denali->controller.ops = &denali_controller_ops;
+        init_completion(&denali->complete);
+        spin_lock_init(&denali->irq_lock);
+        INIT_LIST_HEAD(&denali->chips);
+        denali->active_bank = DENALI_INVALID_BANK;
+        /*
+         * The REVISION register may not be reliable. Platforms are allowed to
+         * override it.
+         */
+        if (!denali->revision)
+                denali->revision = swab16(ioread32(denali->reg + REVISION));
+        denali->nbanks = 1 << FIELD_GET(FEATURES__N_BANKS, features);
+        /* the encoding changed from rev 5.0 to 5.1 */
+        if (denali->revision < 0x0501)
+                denali->nbanks <<= 1;
+        if (features & FEATURES__DMA)
+                denali->dma_avail = true;
+        if (denali->dma_avail) {
+                int dma_bit = denali->caps & DENALI_CAP_DMA_64BIT ? 64 : 32;
+                ret = dma_set_mask(denali->dev, DMA_BIT_MASK(dma_bit));
+                if (ret) {
+                        dev_info(denali->dev,
+                                 "Failed to set DMA mask. Disabling DMA.\n");
+                        denali->dma_avail = false;
+                }
+        }
+        if (denali->dma_avail) {
+                if (denali->caps & DENALI_CAP_DMA_64BIT)
+                        denali->setup_dma = denali_setup_dma64;
+                else
+                        denali->setup_dma = denali_setup_dma32;
+        }
+        if (features & FEATURES__INDEX_ADDR) {
+                denali->host_read = denali_indexed_read;
+                denali->host_write = denali_indexed_write;
+        } else {
+                denali->host_read = denali_direct_read;
+                denali->host_write = denali_direct_write;
+        }
+        /*
+         * Set how many bytes should be skipped before writing data in OOB.
+         * If a non-zero value has already been set (by firmware or something),
+         * just use it. Otherwise, set the driver's default.
+         */
+        denali->oob_skip_bytes = ioread32(denali->reg + SPARE_AREA_SKIP_BYTES);
+        if (!denali->oob_skip_bytes) {
+                denali->oob_skip_bytes = DENALI_DEFAULT_OOB_SKIP_BYTES;
+                iowrite32(denali->oob_skip_bytes,
+                          denali->reg + SPARE_AREA_SKIP_BYTES);
+        }
+        iowrite32(0, denali->reg + TRANSFER_SPARE_REG);
+        iowrite32(GENMASK(denali->nbanks - 1, 0), denali->reg + RB_PIN_ENABLED);
+        iowrite32(CHIP_EN_DONT_CARE__FLAG, denali->reg + CHIP_ENABLE_DONT_CARE);
+        iowrite32(ECC_ENABLE__FLAG, denali->reg + ECC_ENABLE);
+        iowrite32(0xffff, denali->reg + SPARE_AREA_MARKER);
+        denali_clear_irq_all(denali);
+        ret = devm_request_irq(denali->dev, denali->irq, denali_isr,
+                               IRQF_SHARED, DENALI_NAND_NAME, denali);
+        if (ret) {
+                dev_err(denali->dev, "Unable to request IRQ\n");
+                return ret;
+        }
+        denali_enable_irq(denali);
+        return 0;
+}
 EXPORT_SYMBOL(denali_init);
-void denali_remove(struct denali_nand_info *denali)
+void denali_remove(struct denali_controller *denali)
 {
-        nand_release(&denali->nand);
+        struct denali_chip *dchip;
+        list_for_each_entry(dchip, &denali->chips, node)
+                nand_release(&dchip->chip);
        denali_disable_irq(denali);
 }
 EXPORT_SYMBOL(denali_remove);
diff --git a/drivers/mtd/nand/raw/denali.h b/drivers/mtd/nand/raw/denali.h
index c8c2620fc736..e5cdcda56d14 100644
--- a/drivers/mtd/nand/raw/denali.h
+++ b/drivers/mtd/nand/raw/denali.h
@@ -9,6 +9,7 @@
 #include <linux/bits.h>
 #include <linux/completion.h>
+#include <linux/list.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/spinlock_types.h>
 #include <linux/types.h>
@@ -290,38 +291,108 @@
 #define     CHNL_ACTIVE__CHANNEL2                       BIT(2)
 #define     CHNL_ACTIVE__CHANNEL3                       BIT(3)
-struct denali_nand_info {
+/**
-        struct nand_chip nand;
+ * struct denali_chip_sel - per-CS data of Denali NAND
-        unsigned long clk_rate;         /* core clock rate */
+ *
-        unsigned long clk_x_rate;       /* bus interface clock rate */
+ * @bank:                  bank id of the controller this CS is connected to
-        int active_bank;                /* currently selected bank */
+ * @hwhr2_and_we_2_re:     value of timing register HWHR2_AND_WE_2_RE
+ * @tcwaw_and_addr_2_data: value of timing register TCWAW_AND_ADDR_2_DATA
+ * @re_2_we:               value of timing register RE_2_WE
+ * @acc_clks:              value of timing register ACC_CLKS
+ * @rdwr_en_lo_cnt:        value of timing register RDWR_EN_LO_CNT
+ * @rdwr_en_hi_cnt:        value of timing register RDWR_EN_HI_CNT
+ * @cs_setup_cnt:          value of timing register CS_SETUP_CNT
+ * @re_2_re:               value of timing register RE_2_RE
+ */
+struct denali_chip_sel {
+        int bank;
+        u32 hwhr2_and_we_2_re;
+        u32 tcwaw_and_addr_2_data;
+        u32 re_2_we;
+        u32 acc_clks;
+        u32 rdwr_en_lo_cnt;
+        u32 rdwr_en_hi_cnt;
+        u32 cs_setup_cnt;
+        u32 re_2_re;
+};
+/**
+ * struct denali_chip - per-chip data of Denali NAND
+ *
+ * @chip:  base NAND chip structure
+ * @node:  node to be used to associate this chip with the controller
+ * @nsels: the number of CS lines of this chip
+ * @sels:  the array of per-cs data
+ */
+struct denali_chip {
+        struct nand_chip chip;
+        struct list_head node;
+        unsigned int nsels;
+        struct denali_chip_sel sels[0];
+};
+/**
+ * struct denali_controller - Denali NAND controller data
+ *
+ * @controller:     base NAND controller structure
+ * @dev:            device
+ * @chips:          the list of chips attached to this controller
+ * @clk_rate:       frequency of core clock
+ * @clk_x_rate:     frequency of bus interface clock
+ * @reg:            base of Register Interface
+ * @host:           base of Host Data/Command interface
+ * @complete:       completion used to wait for interrupts
+ * @irq:            interrupt number
+ * @irq_mask:       interrupt bits the controller is waiting for
+ * @irq_status:     interrupt bits of events that have happened
+ * @irq_lock:       lock to protect @irq_mask and @irq_status
+ * @dma_avail:      set if DMA engine is available
+ * @devs_per_cs:    number of devices connected in parallel
+ * @oob_skip_bytes: number of bytes in OOB skipped by the ECC engine
+ * @active_bank:    active bank id
+ * @nbanks:         the number of banks supported by this controller
+ * @revision:       IP revision
+ * @caps:           controller capabilities that cannot be detected run-time
+ * @ecc_caps:       ECC engine capabilities
+ * @host_read:      callback for read access of Host Data/Command Interface
+ * @host_write:     callback for write access of Host Data/Command Interface
+ * @setup_dma:      callback for setup of the Data DMA
+ */
+struct denali_controller {
+        struct nand_controller controller;
        struct device *dev;
-        void __iomem *reg;              /* Register Interface */
+        struct list_head chips;
-        void __iomem *host;             /* Host Data/Command Interface */
+        unsigned long clk_rate;
+        unsigned long clk_x_rate;
+        void __iomem *reg;
+        void __iomem *host;
        struct completion complete;
-        spinlock_t irq_lock;            /* protect irq_mask and irq_status */
-        u32 irq_mask;                   /* interrupts we are waiting for */
-        u32 irq_status;                 /* interrupts that have happened */
        int irq;
-        void *buf;                      /* for syndrome layout conversion */
+        u32 irq_mask;
-        int dma_avail;                  /* can support DMA? */
+        u32 irq_status;
-        int devs_per_cs;                /* devices connected in parallel */
+        spinlock_t irq_lock;
-        int oob_skip_bytes;             /* number of bytes reserved for BBM */
+        bool dma_avail;
-        int max_banks;
+        int devs_per_cs;
-        unsigned int revision;          /* IP revision */
+        int oob_skip_bytes;
-        unsigned int caps;              /* IP capability (or quirk) */
+        int active_bank;
+        int nbanks;
+        unsigned int revision;
+        unsigned int caps;
        const struct nand_ecc_caps *ecc_caps;
-        u32 (*host_read)(struct denali_nand_info *denali, u32 addr);
+        u32 (*host_read)(struct denali_controller *denali, u32 addr);
-        void (*host_write)(struct denali_nand_info *denali, u32 addr, u32 data);
+        void (*host_write)(struct denali_controller *denali, u32 addr,
-        void (*setup_dma)(struct denali_nand_info *denali, dma_addr_t dma_addr,
+                           u32 data);
-                          int page, int write);
+        void (*setup_dma)(struct denali_controller *denali, dma_addr_t dma_addr,
+                          int page, bool write);
 };
 #define DENALI_CAP_HW_ECC_FIXUP                 BIT(0)
 #define DENALI_CAP_DMA_64BIT                    BIT(1)
 int denali_calc_ecc_bytes(int step_size, int strength);
-int denali_init(struct denali_nand_info *denali);
+int denali_chip_init(struct denali_controller *denali,
-void denali_remove(struct denali_nand_info *denali);
+                     struct denali_chip *dchip);
+int denali_init(struct denali_controller *denali);
+void denali_remove(struct denali_controller *denali);
 #endif /* __DENALI_H__ */
diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c
index 0b5ae2418815..5e14836f6bd5 100644
--- a/drivers/mtd/nand/raw/denali_dt.c
+++ b/drivers/mtd/nand/raw/denali_dt.c
@@ -18,7 +18,7 @@
 #include "denali.h"
 struct denali_dt {
-        struct denali_nand_info denali;
+        struct denali_controller controller;
        struct clk *clk;        /* core clock */
        struct clk *clk_x;      /* bus interface clock */
        struct clk *clk_ecc;    /* ECC circuit clock */
@@ -71,19 +71,92 @@ static const struct of_device_id denali_nand_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, denali_nand_dt_ids);
+static int denali_dt_chip_init(struct denali_controller *denali,
+                               struct device_node *chip_np)
+{
+        struct denali_chip *dchip;
+        u32 bank;
+        int nsels, i, ret;
+        nsels = of_property_count_u32_elems(chip_np, "reg");
+        if (nsels < 0)
+                return nsels;
+        dchip = devm_kzalloc(denali->dev, struct_size(dchip, sels, nsels),
+                             GFP_KERNEL);
+        if (!dchip)
+                return -ENOMEM;
+        dchip->nsels = nsels;
+        for (i = 0; i < nsels; i++) {
+                ret = of_property_read_u32_index(chip_np, "reg", i, &bank);
+                if (ret)
+                        return ret;
+                dchip->sels[i].bank = bank;
+                nand_set_flash_node(&dchip->chip, chip_np);
+        }
+        return denali_chip_init(denali, dchip);
+}
+/* Backward compatibility for old platforms */
+static int denali_dt_legacy_chip_init(struct denali_controller *denali)
+{
+        struct denali_chip *dchip;
+        int nsels, i;
+        nsels = denali->nbanks;
+        dchip = devm_kzalloc(denali->dev, struct_size(dchip, sels, nsels),
+                             GFP_KERNEL);
+        if (!dchip)
+                return -ENOMEM;
+        dchip->nsels = nsels;
+        for (i = 0; i < nsels; i++)
+                dchip->sels[i].bank = i;
+        nand_set_flash_node(&dchip->chip, denali->dev->of_node);
+        return denali_chip_init(denali, dchip);
+}
+/*
+ * Check the DT binding.
+ * The new binding expects chip subnodes in the controller node.
+ * So, #address-cells = <1>; #size-cells = <0>; are required.
+ * Check the #size-cells to distinguish the binding.
+ */
+static bool denali_dt_is_legacy_binding(struct device_node *np)
+{
+        u32 cells;
+        int ret;
+        ret = of_property_read_u32(np, "#size-cells", &cells);
+        if (ret)
+                return true;
+        return cells != 0;
+}
 static int denali_dt_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct resource *res;
        struct denali_dt *dt;
        const struct denali_dt_data *data;
-        struct denali_nand_info *denali;
+        struct denali_controller *denali;
+        struct device_node *np;
        int ret;
        dt = devm_kzalloc(dev, sizeof(*dt), GFP_KERNEL);
        if (!dt)
                return -ENOMEM;
-        denali = &dt->denali;
+        denali = &dt->controller;
        data = of_device_get_match_data(dev);
        if (data) {
@@ -140,9 +213,26 @@ static int denali_dt_probe(struct platform_device *pdev)
        if (ret)
                goto out_disable_clk_ecc;
+        if (denali_dt_is_legacy_binding(dev->of_node)) {
+                ret = denali_dt_legacy_chip_init(denali);
+                if (ret)
+                        goto out_remove_denali;
+        } else {
+                for_each_child_of_node(dev->of_node, np) {
+                        ret = denali_dt_chip_init(denali, np);
+                        if (ret) {
+                                of_node_put(np);
+                                goto out_remove_denali;
+                        }
+                }
+        }
        platform_set_drvdata(pdev, dt);
        return 0;
+out_remove_denali:
+        denali_remove(denali);
 out_disable_clk_ecc:
        clk_disable_unprepare(dt->clk_ecc);
 out_disable_clk_x:
@@ -157,7 +247,7 @@ static int denali_dt_remove(struct platform_device *pdev)
 {
        struct denali_dt *dt = platform_get_drvdata(pdev);
-        denali_remove(&dt->denali);
+        denali_remove(&dt->controller);
        clk_disable_unprepare(dt->clk_ecc);
        clk_disable_unprepare(dt->clk_x);
        clk_disable_unprepare(dt->clk);
diff --git a/drivers/mtd/nand/raw/denali_pci.c b/drivers/mtd/nand/raw/denali_pci.c
index 48e9ac54ad53..d62aa5271753 100644
--- a/drivers/mtd/nand/raw/denali_pci.c
+++ b/drivers/mtd/nand/raw/denali_pci.c
@@ -29,10 +29,11 @@ NAND_ECC_CAPS_SINGLE(denali_pci_ecc_caps, denali_calc_ecc_bytes, 512, 8, 15);
 static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        int ret;
        resource_size_t csr_base, mem_base;
        unsigned long csr_len, mem_len;
-        struct denali_nand_info *denali;
+        struct denali_controller *denali;
+        struct denali_chip *dchip;
+        int nsels, ret, i;
        denali = devm_kzalloc(&dev->dev, sizeof(*denali), GFP_KERNEL);
        if (!denali)
@@ -64,7 +65,6 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        denali->dev = &dev->dev;
        denali->irq = dev->irq;
        denali->ecc_caps = &denali_pci_ecc_caps;
-        denali->nand.ecc.options |= NAND_ECC_MAXIMIZE;
        denali->clk_rate = 50000000;            /* 50 MHz */
        denali->clk_x_rate = 200000000;         /* 200 MHz */
@@ -84,27 +84,49 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (!denali->host) {
                dev_err(&dev->dev, "Spectra: ioremap_nocache failed!");
                ret = -ENOMEM;
-                goto failed_remap_reg;
+                goto out_unmap_reg;
        }
        ret = denali_init(denali);
        if (ret)
-                goto failed_remap_mem;
+                goto out_unmap_host;
+        nsels = denali->nbanks;
+        dchip = devm_kzalloc(denali->dev, struct_size(dchip, sels, nsels),
+                             GFP_KERNEL);
+        if (!dchip) {
+                ret = -ENOMEM;
+                goto out_remove_denali;
+        }
+        dchip->chip.ecc.options |= NAND_ECC_MAXIMIZE;
+        dchip->nsels = nsels;
+        for (i = 0; i < nsels; i++)
+                dchip->sels[i].bank = i;
+        ret = denali_chip_init(denali, dchip);
+        if (ret)
+                goto out_remove_denali;
        pci_set_drvdata(dev, denali);
        return 0;
-failed_remap_mem:
+out_remove_denali:
+        denali_remove(denali);
+out_unmap_host:
        iounmap(denali->host);
-failed_remap_reg:
+out_unmap_reg:
        iounmap(denali->reg);
        return ret;
 }
 static void denali_pci_remove(struct pci_dev *dev)
 {
-        struct denali_nand_info *denali = pci_get_drvdata(dev);
+        struct denali_controller *denali = pci_get_drvdata(dev);
        denali_remove(denali);
        iounmap(denali->reg);
diff --git a/drivers/mtd/nand/raw/diskonchip.c b/drivers/mtd/nand/raw/diskonchip.c
index 53f57e0f007e..f430c4bf0323 100644
--- a/drivers/mtd/nand/raw/diskonchip.c
+++ b/drivers/mtd/nand/raw/diskonchip.c
@@ -1028,6 +1028,7 @@ static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partitio
 {
        struct nand_chip *this = mtd_to_nand(mtd);
        struct doc_priv *doc = nand_get_controller_data(this);
+        struct nand_memory_organization *memorg;
        int ret = 0;
        u_char *buf;
        struct NFTLMediaHeader *mh;
@@ -1036,6 +1037,8 @@ static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partitio
        unsigned blocks, maxblocks;
        int offs, numheaders;
+        memorg = nanddev_get_memorg(&this->base);
        buf = kmalloc(mtd->writesize, GFP_KERNEL);
        if (!buf) {
                return 0;
@@ -1082,6 +1085,7 @@ static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partitio
           implementation of the NAND layer.  */
        if (mh->UnitSizeFactor != 0xff) {
                this->bbt_erase_shift += (0xff - mh->UnitSizeFactor);
+                memorg->pages_per_eraseblock <<= (0xff - mh->UnitSizeFactor);
                mtd->erasesize <<= (0xff - mh->UnitSizeFactor);
                pr_info("Setting virtual erase size to %d\n", mtd->erasesize);
                blocks = mtd->size >> this->bbt_erase_shift;
@@ -1287,7 +1291,7 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)
        struct doc_priv *doc = nand_get_controller_data(this);
        struct mtd_partition parts[5];
-        if (this->numchips > doc->chips_per_floor) {
+        if (nanddev_ntargets(&this->base) > doc->chips_per_floor) {
                pr_err("Multi-floor INFTL devices not yet supported.\n");
                return -EIO;
        }
@@ -1477,6 +1481,7 @@ static int __init doc_probe(unsigned long physadr)
                        break;
                case DOC_ChipID_DocMilPlus32:
                        pr_err("DiskOnChip Millennium Plus 32MB is not supported, ignoring.\n");
+                        /* fall through */
                default:
                        ret = -ENODEV;
                        goto notfound;
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index 70f0d2b450ea..423828ff68e6 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -355,6 +355,15 @@ static void fsl_elbc_cmdfunc(struct nand_chip *chip, unsigned int command,
                fsl_elbc_run_command(mtd);
                return;
+        /* RNDOUT moves the pointer inside the page */
+        case NAND_CMD_RNDOUT:
+                dev_dbg(priv->dev,
+                        "fsl_elbc_cmdfunc: NAND_CMD_RNDOUT, column: 0x%x.\n",
+                        column);
+                elbc_fcm_ctrl->index = column;
+                return;
        /* READOOB reads only the OOB because no ECC is performed. */
        case NAND_CMD_READOOB:
                dev_vdbg(priv->dev,
@@ -635,79 +644,6 @@ static int fsl_elbc_wait(struct nand_chip *chip)
        return (elbc_fcm_ctrl->mdr & 0xff) | NAND_STATUS_WP;
 }
-static int fsl_elbc_attach_chip(struct nand_chip *chip)
-{
-        struct mtd_info *mtd = nand_to_mtd(chip);
-        struct fsl_elbc_mtd *priv = nand_get_controller_data(chip);
-        struct fsl_lbc_ctrl *ctrl = priv->ctrl;
-        struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
-        unsigned int al;
-        /* calculate FMR Address Length field */
-        al = 0;
-        if (chip->pagemask & 0xffff0000)
-                al++;
-        if (chip->pagemask & 0xff000000)
-                al++;
-        priv->fmr |= al << FMR_AL_SHIFT;
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->numchips = %d\n",
-                chip->numchips);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->chipsize = %lld\n",
-                chip->chipsize);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->pagemask = %8x\n",
-                chip->pagemask);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->legacy.chip_delay = %d\n",
-                chip->legacy.chip_delay);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->badblockpos = %d\n",
-                chip->badblockpos);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->chip_shift = %d\n",
-                chip->chip_shift);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->page_shift = %d\n",
-                chip->page_shift);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->phys_erase_shift = %d\n",
-                chip->phys_erase_shift);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.mode = %d\n",
-                chip->ecc.mode);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.steps = %d\n",
-                chip->ecc.steps);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.bytes = %d\n",
-                chip->ecc.bytes);
-        dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.total = %d\n",
-                chip->ecc.total);
-        dev_dbg(priv->dev, "fsl_elbc_init: mtd->ooblayout = %p\n",
-                mtd->ooblayout);
-        dev_dbg(priv->dev, "fsl_elbc_init: mtd->flags = %08x\n", mtd->flags);
-        dev_dbg(priv->dev, "fsl_elbc_init: mtd->size = %lld\n", mtd->size);
-        dev_dbg(priv->dev, "fsl_elbc_init: mtd->erasesize = %d\n",
-                mtd->erasesize);
-        dev_dbg(priv->dev, "fsl_elbc_init: mtd->writesize = %d\n",
-                mtd->writesize);
-        dev_dbg(priv->dev, "fsl_elbc_init: mtd->oobsize = %d\n",
-                mtd->oobsize);
-        /* adjust Option Register and ECC to match Flash page size */
-        if (mtd->writesize == 512) {
-                priv->page_size = 0;
-                clrbits32(&lbc->bank[priv->bank].or, OR_FCM_PGS);
-        } else if (mtd->writesize == 2048) {
-                priv->page_size = 1;
-                setbits32(&lbc->bank[priv->bank].or, OR_FCM_PGS);
-        } else {
-                dev_err(priv->dev,
-                        "fsl_elbc_init: page size %d is not supported\n",
-                        mtd->writesize);
-                return -ENOTSUPP;
-        }
-        return 0;
-}
-static const struct nand_controller_ops fsl_elbc_controller_ops = {
-        .attach_chip = fsl_elbc_attach_chip,
-};
 static int fsl_elbc_read_page(struct nand_chip *chip, uint8_t *buf,
                              int oob_required, int page)
 {
@@ -794,27 +730,116 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
        chip->controller = &elbc_fcm_ctrl->controller;
        nand_set_controller_data(chip, priv);
-        chip->ecc.read_page = fsl_elbc_read_page;
+        return 0;
-        chip->ecc.write_page = fsl_elbc_write_page;
+}
-        chip->ecc.write_subpage = fsl_elbc_write_subpage;
+static int fsl_elbc_attach_chip(struct nand_chip *chip)
-        /* If CS Base Register selects full hardware ECC then use it */
+{
-        if ((in_be32(&lbc->bank[priv->bank].br) & BR_DECC) ==
+        struct mtd_info *mtd = nand_to_mtd(chip);
-            BR_DECC_CHK_GEN) {
+        struct fsl_elbc_mtd *priv = nand_get_controller_data(chip);
-                chip->ecc.mode = NAND_ECC_HW;
+        struct fsl_lbc_ctrl *ctrl = priv->ctrl;
-                mtd_set_ooblayout(mtd, &fsl_elbc_ooblayout_ops);
+        struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
-                chip->ecc.size = 512;
+        unsigned int al;
-                chip->ecc.bytes = 3;
-                chip->ecc.strength = 1;
+        switch (chip->ecc.mode) {
+        /*
+         * if ECC was not chosen in DT, decide whether to use HW or SW ECC from
+         * CS Base Register
+         */
+        case NAND_ECC_NONE:
+                /* If CS Base Register selects full hardware ECC then use it */
+                if ((in_be32(&lbc->bank[priv->bank].br) & BR_DECC) ==
+                    BR_DECC_CHK_GEN) {
+                        chip->ecc.read_page = fsl_elbc_read_page;
+                        chip->ecc.write_page = fsl_elbc_write_page;
+                        chip->ecc.write_subpage = fsl_elbc_write_subpage;
+                        chip->ecc.mode = NAND_ECC_HW;
+                        mtd_set_ooblayout(mtd, &fsl_elbc_ooblayout_ops);
+                        chip->ecc.size = 512;
+                        chip->ecc.bytes = 3;
+                        chip->ecc.strength = 1;
+                } else {
+                        /* otherwise fall back to default software ECC */
+                        chip->ecc.mode = NAND_ECC_SOFT;
+                        chip->ecc.algo = NAND_ECC_HAMMING;
+                }
+                break;
+        /* if SW ECC was chosen in DT, we do not need to set anything here */
+        case NAND_ECC_SOFT:
+                break;
+        /* should we also implement NAND_ECC_HW to do as the code above? */
+        default:
+                return -EINVAL;
+        }
+        /* calculate FMR Address Length field */
+        al = 0;
+        if (chip->pagemask & 0xffff0000)
+                al++;
+        if (chip->pagemask & 0xff000000)
+                al++;
+        priv->fmr |= al << FMR_AL_SHIFT;
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->numchips = %d\n",
+                nanddev_ntargets(&chip->base));
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->chipsize = %lld\n",
+                nanddev_target_size(&chip->base));
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->pagemask = %8x\n",
+                chip->pagemask);
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->legacy.chip_delay = %d\n",
+                chip->legacy.chip_delay);
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->badblockpos = %d\n",
+                chip->badblockpos);
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->chip_shift = %d\n",
+                chip->chip_shift);
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->page_shift = %d\n",
+                chip->page_shift);
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->phys_erase_shift = %d\n",
+                chip->phys_erase_shift);
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.mode = %d\n",
+                chip->ecc.mode);
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.steps = %d\n",
+                chip->ecc.steps);
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.bytes = %d\n",
+                chip->ecc.bytes);
+        dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.total = %d\n",
+                chip->ecc.total);
+        dev_dbg(priv->dev, "fsl_elbc_init: mtd->ooblayout = %p\n",
+                mtd->ooblayout);
+        dev_dbg(priv->dev, "fsl_elbc_init: mtd->flags = %08x\n", mtd->flags);
+        dev_dbg(priv->dev, "fsl_elbc_init: mtd->size = %lld\n", mtd->size);
+        dev_dbg(priv->dev, "fsl_elbc_init: mtd->erasesize = %d\n",
+                mtd->erasesize);
+        dev_dbg(priv->dev, "fsl_elbc_init: mtd->writesize = %d\n",
+                mtd->writesize);
+        dev_dbg(priv->dev, "fsl_elbc_init: mtd->oobsize = %d\n",
+                mtd->oobsize);
+        /* adjust Option Register and ECC to match Flash page size */
+        if (mtd->writesize == 512) {
+                priv->page_size = 0;
+                clrbits32(&lbc->bank[priv->bank].or, OR_FCM_PGS);
+        } else if (mtd->writesize == 2048) {
+                priv->page_size = 1;
+                setbits32(&lbc->bank[priv->bank].or, OR_FCM_PGS);
        } else {
-                /* otherwise fall back to default software ECC */
+                dev_err(priv->dev,
-                chip->ecc.mode = NAND_ECC_SOFT;
+                        "fsl_elbc_init: page size %d is not supported\n",
-                chip->ecc.algo = NAND_ECC_HAMMING;
+                        mtd->writesize);
+                return -ENOTSUPP;
        }
        return 0;
 }
+static const struct nand_controller_ops fsl_elbc_controller_ops = {
+        .attach_chip = fsl_elbc_attach_chip,
+};
 static int fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv)
 {
        struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = priv->ctrl->nand;
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index e65d274399f9..04a3dcd675bf 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -722,9 +722,9 @@ static int fsl_ifc_attach_chip(struct nand_chip *chip)
        struct fsl_ifc_mtd *priv = nand_get_controller_data(chip);
        dev_dbg(priv->dev, "%s: nand->numchips = %d\n", __func__,
-                                                        chip->numchips);
+                nanddev_ntargets(&chip->base));
        dev_dbg(priv->dev, "%s: nand->chipsize = %lld\n", __func__,
-                                                        chip->chipsize);
+                nanddev_target_size(&chip->base));
        dev_dbg(priv->dev, "%s: nand->pagemask = %8x\n", __func__,
                                                        chip->pagemask);
        dev_dbg(priv->dev, "%s: nand->legacy.chip_delay = %d\n", __func__,
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c
index a4768df5083f..a8b26d2e793c 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c
@@ -157,8 +157,7 @@ int gpmi_init(struct gpmi_nand_data *this)
         * Reset BCH here, too. We got failures otherwise :(
         * See later BCH reset for explanation of MX23 and MX28 handling
         */
-        ret = gpmi_reset_block(r->bch_regs,
+        ret = gpmi_reset_block(r->bch_regs, GPMI_IS_MXS(this));
-                               GPMI_IS_MX23(this) || GPMI_IS_MX28(this));
        if (ret)
                goto err_out;
@@ -266,8 +265,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
        * chip, otherwise it will lock up. So we skip resetting BCH on the MX23.
        * and MX28.
        */
-        ret = gpmi_reset_block(r->bch_regs,
+        ret = gpmi_reset_block(r->bch_regs, GPMI_IS_MXS(this));
-                               GPMI_IS_MX23(this) || GPMI_IS_MX28(this));
        if (ret)
                goto err_out;
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index ed405c9434fe..40df20d1adf5 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -171,7 +171,7 @@ static inline bool gpmi_check_ecc(struct gpmi_nand_data *this)
        struct bch_geometry *geo = &this->bch_geometry;
        /* Do the sanity check. */
-        if (GPMI_IS_MX23(this) || GPMI_IS_MX28(this)) {
+        if (GPMI_IS_MXS(this)) {
                /* The mx23/mx28 only support the GF13. */
                if (geo->gf_len == 14)
                        return false;
@@ -204,7 +204,8 @@ static int set_geometry_by_ecc_info(struct gpmi_nand_data *this,
        default:
                dev_err(this->dev,
                        "unsupported nand chip. ecc bits : %d, ecc size : %d\n",
-                        chip->ecc_strength_ds, chip->ecc_step_ds);
+                        chip->base.eccreq.strength,
+                        chip->base.eccreq.step_size);
                return -EINVAL;
        }
        geo->ecc_chunk_size = ecc_step;
@@ -417,11 +418,13 @@ int common_nfc_set_geometry(struct gpmi_nand_data *this)
        if ((of_property_read_bool(this->dev->of_node, "fsl,use-minimum-ecc"))
                                || legacy_set_geometry(this)) {
-                if (!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0))
+                if (!(chip->base.eccreq.strength > 0 &&
+                      chip->base.eccreq.step_size > 0))
                        return -EINVAL;
-                return set_geometry_by_ecc_info(this, chip->ecc_strength_ds,
+                return set_geometry_by_ecc_info(this,
-                                                chip->ecc_step_ds);
+                                                chip->base.eccreq.strength,
+                                                chip->base.eccreq.step_size);
        }
        return 0;
@@ -1602,7 +1605,7 @@ static int mx23_check_transcription_stamp(struct gpmi_nand_data *this)
        unsigned int search_area_size_in_strides;
        unsigned int stride;
        unsigned int page;
-        uint8_t *buffer = chip->data_buf;
+        u8 *buffer = nand_get_data_buf(chip);
        int saved_chip_number;
        int found_an_ncb_fingerprint = false;
@@ -1664,7 +1667,7 @@ static int mx23_write_transcription_stamp(struct gpmi_nand_data *this)
        unsigned int block;
        unsigned int stride;
        unsigned int page;
-        uint8_t      *buffer = chip->data_buf;
+        u8 *buffer = nand_get_data_buf(chip);
        int saved_chip_number;
        int status;
@@ -1753,7 +1756,7 @@ static int mx23_boot_init(struct gpmi_nand_data  *this)
        dev_dbg(dev, "Transcribing bad block marks...\n");
        /* Compute the number of blocks in the entire medium. */
-        block_count = chip->chipsize >> chip->phys_erase_shift;
+        block_count = nanddev_eraseblocks_per_target(&chip->base);
        /*
         * Loop over all the blocks in the medium, transcribing block marks as
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
index d0b79bac2728..a804a4a5bd46 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
@@ -207,4 +207,5 @@ void gpmi_copy_bits(u8 *dst, size_t dst_bit_off,
 #define GPMI_IS_MX6(x)          (GPMI_IS_MX6Q(x) || GPMI_IS_MX6SX(x) || \
                                 GPMI_IS_MX7D(x))
+#define GPMI_IS_MXS(x)          (GPMI_IS_MX23(x) || GPMI_IS_MX28(x))
 #endif
diff --git a/drivers/mtd/nand/raw/hisi504_nand.c b/drivers/mtd/nand/raw/hisi504_nand.c
index f3f9aa160cff..e4526fff9da4 100644
--- a/drivers/mtd/nand/raw/hisi504_nand.c
+++ b/drivers/mtd/nand/raw/hisi504_nand.c
@@ -849,7 +849,7 @@ static int hisi_nfc_resume(struct device *dev)
        struct hinfc_host *host = dev_get_drvdata(dev);
        struct nand_chip *chip = &host->chip;
-        for (cs = 0; cs < chip->numchips; cs++)
+        for (cs = 0; cs < nanddev_ntargets(&chip->base); cs++)
                hisi_nfc_send_cmd_reset(host, cs);
        hinfc_write(host, SET_HINFC504_PWIDTH(HINFC504_W_LATCH,
                    HINFC504_R_LATCH, HINFC504_RW_LATCH), HINFC504_PWIDTH);
diff --git a/drivers/mtd/nand/raw/ingenic/Kconfig b/drivers/mtd/nand/raw/ingenic/Kconfig
new file mode 100644
index 000000000000..7cfc77021154
--- /dev/null
+++ b/drivers/mtd/nand/raw/ingenic/Kconfig
@@ -0,0 +1,50 @@
+config MTD_NAND_JZ4740
+        tristate "JZ4740 NAND controller"
+        depends on MACH_JZ4740 || COMPILE_TEST
+        depends on HAS_IOMEM
+        help
+          Enables support for NAND Flash on JZ4740 SoC based boards.
+config MTD_NAND_JZ4780
+        tristate "JZ4780 NAND controller"
+        depends on 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.
+if MTD_NAND_JZ4780
+config MTD_NAND_INGENIC_ECC
+        tristate
+config MTD_NAND_JZ4740_ECC
+        tristate "Hardware BCH support for JZ4740 SoC"
+        select MTD_NAND_INGENIC_ECC
+        help
+          Enable this driver to support the Reed-Solomon error-correction
+          hardware present on the JZ4740 SoC from Ingenic.
+          This driver can also be built as a module. If so, the module
+          will be called jz4740-ecc.
+config MTD_NAND_JZ4725B_BCH
+        tristate "Hardware BCH support for JZ4725B SoC"
+        select MTD_NAND_INGENIC_ECC
+        help
+          Enable this driver to support the BCH error-correction hardware
+          present on the JZ4725B SoC from Ingenic.
+          This driver can also be built as a module. If so, the module
+          will be called jz4725b-bch.
+config MTD_NAND_JZ4780_BCH
+        tristate "Hardware BCH support for JZ4780 SoC"
+        select MTD_NAND_INGENIC_ECC
+        help
+          Enable this driver to support the BCH error-correction hardware
+          present on the JZ4780 SoC from Ingenic.
+          This driver can also be built as a module. If so, the module
+          will be called jz4780-bch.
+endif # MTD_NAND_JZ4780
diff --git a/drivers/mtd/nand/raw/ingenic/Makefile b/drivers/mtd/nand/raw/ingenic/Makefile
new file mode 100644
index 000000000000..ab2c5f47e5b7
--- /dev/null
+++ b/drivers/mtd/nand/raw/ingenic/Makefile
@@ -0,0 +1,7 @@
+obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o
+obj-$(CONFIG_MTD_NAND_JZ4780) += ingenic_nand.o
+obj-$(CONFIG_MTD_NAND_INGENIC_ECC) += ingenic_ecc.o
+obj-$(CONFIG_MTD_NAND_JZ4740_ECC) += jz4740_ecc.o
+obj-$(CONFIG_MTD_NAND_JZ4725B_BCH) += jz4725b_bch.o
+obj-$(CONFIG_MTD_NAND_JZ4780_BCH) += jz4780_bch.o
diff --git a/drivers/mtd/nand/raw/ingenic/ingenic_ecc.c b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.c
new file mode 100644
index 000000000000..d3e085c5685a
--- /dev/null
+++ b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.c
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * JZ47xx ECC common code
+ *
+ * Copyright (c) 2015 Imagination Technologies
+ * Author: Alex Smith <alex.smith@imgtec.com>
+ */
+#include <linux/clk.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include "ingenic_ecc.h"
+/**
+ * ingenic_ecc_calculate() - calculate ECC for a data buffer
+ * @ecc: ECC device.
+ * @params: ECC parameters.
+ * @buf: input buffer with raw data.
+ * @ecc_code: output buffer with ECC.
+ *
+ * Return: 0 on success, -ETIMEDOUT if timed out while waiting for ECC
+ * controller.
+ */
+int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
+                          struct ingenic_ecc_params *params,
+                          const u8 *buf, u8 *ecc_code)
+{
+        return ecc->ops->calculate(ecc, params, buf, ecc_code);
+}
+EXPORT_SYMBOL(ingenic_ecc_calculate);
+/**
+ * ingenic_ecc_correct() - detect and correct bit errors
+ * @ecc: ECC device.
+ * @params: ECC parameters.
+ * @buf: raw data read from the chip.
+ * @ecc_code: ECC read from the chip.
+ *
+ * Given the raw data and the ECC read from the NAND device, detects and
+ * corrects errors in the data.
+ *
+ * Return: the number of bit errors corrected, -EBADMSG if there are too many
+ * errors to correct or -ETIMEDOUT if we timed out waiting for the controller.
+ */
+int ingenic_ecc_correct(struct ingenic_ecc *ecc,
+                        struct ingenic_ecc_params *params,
+                        u8 *buf, u8 *ecc_code)
+{
+        return ecc->ops->correct(ecc, params, buf, ecc_code);
+}
+EXPORT_SYMBOL(ingenic_ecc_correct);
+/**
+ * ingenic_ecc_get() - get the ECC controller device
+ * @np: ECC device tree node.
+ *
+ * Gets the ECC controller device from the specified device tree node. The
+ * device must be released with ingenic_ecc_release() when it is no longer being
+ * used.
+ *
+ * Return: a pointer to ingenic_ecc, errors are encoded into the pointer.
+ * PTR_ERR(-EPROBE_DEFER) if the device hasn't been initialised yet.
+ */
+static struct ingenic_ecc *ingenic_ecc_get(struct device_node *np)
+{
+        struct platform_device *pdev;
+        struct ingenic_ecc *ecc;
+        pdev = of_find_device_by_node(np);
+        if (!pdev || !platform_get_drvdata(pdev))
+                return ERR_PTR(-EPROBE_DEFER);
+        get_device(&pdev->dev);
+        ecc = platform_get_drvdata(pdev);
+        clk_prepare_enable(ecc->clk);
+        return ecc;
+}
+/**
+ * of_ingenic_ecc_get() - get the ECC controller from a DT node
+ * @of_node: the node that contains an ecc-engine property.
+ *
+ * Get the ecc-engine property from the given device tree
+ * node and pass it to ingenic_ecc_get to do the work.
+ *
+ * Return: a pointer to ingenic_ecc, errors are encoded into the pointer.
+ * PTR_ERR(-EPROBE_DEFER) if the device hasn't been initialised yet.
+ */
+struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *of_node)
+{
+        struct ingenic_ecc *ecc = NULL;
+        struct device_node *np;
+        np = of_parse_phandle(of_node, "ecc-engine", 0);
+        /*
+         * If the ecc-engine property is not found, check for the deprecated
+         * ingenic,bch-controller property
+         */
+        if (!np)
+                np = of_parse_phandle(of_node, "ingenic,bch-controller", 0);
+        if (np) {
+                ecc = ingenic_ecc_get(np);
+                of_node_put(np);
+        }
+        return ecc;
+}
+EXPORT_SYMBOL(of_ingenic_ecc_get);
+/**
+ * ingenic_ecc_release() - release the ECC controller device
+ * @ecc: ECC device.
+ */
+void ingenic_ecc_release(struct ingenic_ecc *ecc)
+{
+        clk_disable_unprepare(ecc->clk);
+        put_device(ecc->dev);
+}
+EXPORT_SYMBOL(ingenic_ecc_release);
+int ingenic_ecc_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct ingenic_ecc *ecc;
+        struct resource *res;
+        ecc = devm_kzalloc(dev, sizeof(*ecc), GFP_KERNEL);
+        if (!ecc)
+                return -ENOMEM;
+        ecc->ops = device_get_match_data(dev);
+        if (!ecc->ops)
+                return -EINVAL;
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        ecc->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(ecc->base))
+                return PTR_ERR(ecc->base);
+        ecc->ops->disable(ecc);
+        ecc->clk = devm_clk_get(dev, NULL);
+        if (IS_ERR(ecc->clk)) {
+                dev_err(dev, "failed to get clock: %ld\n", PTR_ERR(ecc->clk));
+                return PTR_ERR(ecc->clk);
+        }
+        mutex_init(&ecc->lock);
+        ecc->dev = dev;
+        platform_set_drvdata(pdev, ecc);
+        return 0;
+}
+EXPORT_SYMBOL(ingenic_ecc_probe);
+MODULE_AUTHOR("Alex Smith <alex@alex-smith.me.uk>");
+MODULE_AUTHOR("Harvey Hunt <harveyhuntnexus@gmail.com>");
+MODULE_DESCRIPTION("Ingenic ECC common driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h
new file mode 100644
index 000000000000..2cda439b5e11
--- /dev/null
+++ b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h
@@ -0,0 +1,83 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __DRIVERS_MTD_NAND_INGENIC_ECC_INTERNAL_H__
+#define __DRIVERS_MTD_NAND_INGENIC_ECC_INTERNAL_H__
+#include <linux/compiler_types.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/types.h>
+#include <uapi/asm-generic/errno-base.h>
+struct clk;
+struct device;
+struct ingenic_ecc;
+struct platform_device;
+/**
+ * struct ingenic_ecc_params - ECC parameters
+ * @size: data bytes per ECC step.
+ * @bytes: ECC bytes per step.
+ * @strength: number of correctable bits per ECC step.
+ */
+struct ingenic_ecc_params {
+        int size;
+        int bytes;
+        int strength;
+};
+#if IS_ENABLED(CONFIG_MTD_NAND_INGENIC_ECC)
+int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
+                          struct ingenic_ecc_params *params,
+                          const u8 *buf, u8 *ecc_code);
+int ingenic_ecc_correct(struct ingenic_ecc *ecc,
+                        struct ingenic_ecc_params *params, u8 *buf,
+                        u8 *ecc_code);
+void ingenic_ecc_release(struct ingenic_ecc *ecc);
+struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np);
+#else /* CONFIG_MTD_NAND_INGENIC_ECC */
+int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
+                          struct ingenic_ecc_params *params,
+                          const u8 *buf, u8 *ecc_code)
+{
+        return -ENODEV;
+}
+int ingenic_ecc_correct(struct ingenic_ecc *ecc,
+                        struct ingenic_ecc_params *params, u8 *buf,
+                        u8 *ecc_code)
+{
+        return -ENODEV;
+}
+void ingenic_ecc_release(struct ingenic_ecc *ecc)
+{
+}
+struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np)
+{
+        return ERR_PTR(-ENODEV);
+}
+#endif /* CONFIG_MTD_NAND_INGENIC_ECC */
+struct ingenic_ecc_ops {
+        void (*disable)(struct ingenic_ecc *ecc);
+        int (*calculate)(struct ingenic_ecc *ecc,
+                         struct ingenic_ecc_params *params,
+                         const u8 *buf, u8 *ecc_code);
+        int (*correct)(struct ingenic_ecc *ecc,
+                        struct ingenic_ecc_params *params,
+                        u8 *buf, u8 *ecc_code);
+};
+struct ingenic_ecc {
+        struct device *dev;
+        const struct ingenic_ecc_ops *ops;
+        void __iomem *base;
+        struct clk *clk;
+        struct mutex lock;
+};
+int ingenic_ecc_probe(struct platform_device *pdev);
+#endif /* __DRIVERS_MTD_NAND_INGENIC_ECC_INTERNAL_H__ */
diff --git a/drivers/mtd/nand/raw/ingenic/ingenic_nand.c b/drivers/mtd/nand/raw/ingenic/ingenic_nand.c
new file mode 100644
index 000000000000..d7b7c0f13909
--- /dev/null
+++ b/drivers/mtd/nand/raw/ingenic/ingenic_nand.c
@@ -0,0 +1,530 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Ingenic JZ47xx NAND driver
+ *
+ * Copyright (c) 2015 Imagination Technologies
+ * Author: Alex Smith <alex.smith@imgtec.com>
+ */
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/gpio/consumer.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/rawnand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/jz4780-nemc.h>
+#include "ingenic_ecc.h"
+#define DRV_NAME        "ingenic-nand"
+/* Command delay when there is no R/B pin. */
+#define RB_DELAY_US     100
+struct jz_soc_info {
+        unsigned long data_offset;
+        unsigned long addr_offset;
+        unsigned long cmd_offset;
+        const struct mtd_ooblayout_ops *oob_layout;
+};
+struct ingenic_nand_cs {
+        unsigned int bank;
+        void __iomem *base;
+};
+struct ingenic_nfc {
+        struct device *dev;
+        struct ingenic_ecc *ecc;
+        const struct jz_soc_info *soc_info;
+        struct nand_controller controller;
+        unsigned int num_banks;
+        struct list_head chips;
+        int selected;
+        struct ingenic_nand_cs cs[];
+};
+struct ingenic_nand {
+        struct nand_chip chip;
+        struct list_head chip_list;
+        struct gpio_desc *busy_gpio;
+        struct gpio_desc *wp_gpio;
+        unsigned int reading: 1;
+};
+static inline struct ingenic_nand *to_ingenic_nand(struct mtd_info *mtd)
+{
+        return container_of(mtd_to_nand(mtd), struct ingenic_nand, chip);
+}
+static inline struct ingenic_nfc *to_ingenic_nfc(struct nand_controller *ctrl)
+{
+        return container_of(ctrl, struct ingenic_nfc, controller);
+}
+static int qi_lb60_ooblayout_ecc(struct mtd_info *mtd, int section,
+                                 struct mtd_oob_region *oobregion)
+{
+        struct nand_chip *chip = mtd_to_nand(mtd);
+        struct nand_ecc_ctrl *ecc = &chip->ecc;
+        if (section || !ecc->total)
+                return -ERANGE;
+        oobregion->length = ecc->total;
+        oobregion->offset = 12;
+        return 0;
+}
+static int qi_lb60_ooblayout_free(struct mtd_info *mtd, int section,
+                                  struct mtd_oob_region *oobregion)
+{
+        struct nand_chip *chip = mtd_to_nand(mtd);
+        struct nand_ecc_ctrl *ecc = &chip->ecc;
+        if (section)
+                return -ERANGE;
+        oobregion->length = mtd->oobsize - ecc->total - 12;
+        oobregion->offset = 12 + ecc->total;
+        return 0;
+}
+const struct mtd_ooblayout_ops qi_lb60_ooblayout_ops = {
+        .ecc = qi_lb60_ooblayout_ecc,
+        .free = qi_lb60_ooblayout_free,
+};
+static int jz4725b_ooblayout_ecc(struct mtd_info *mtd, int section,
+                                 struct mtd_oob_region *oobregion)
+{
+        struct nand_chip *chip = mtd_to_nand(mtd);
+        struct nand_ecc_ctrl *ecc = &chip->ecc;
+        if (section || !ecc->total)
+                return -ERANGE;
+        oobregion->length = ecc->total;
+        oobregion->offset = 3;
+        return 0;
+}
+static int jz4725b_ooblayout_free(struct mtd_info *mtd, int section,
+                                  struct mtd_oob_region *oobregion)
+{
+        struct nand_chip *chip = mtd_to_nand(mtd);
+        struct nand_ecc_ctrl *ecc = &chip->ecc;
+        if (section)
+                return -ERANGE;
+        oobregion->length = mtd->oobsize - ecc->total - 3;
+        oobregion->offset = 3 + ecc->total;
+        return 0;
+}
+static const struct mtd_ooblayout_ops jz4725b_ooblayout_ops = {
+        .ecc = jz4725b_ooblayout_ecc,
+        .free = jz4725b_ooblayout_free,
+};
+static void ingenic_nand_select_chip(struct nand_chip *chip, int chipnr)
+{
+        struct ingenic_nand *nand = to_ingenic_nand(nand_to_mtd(chip));
+        struct ingenic_nfc *nfc = to_ingenic_nfc(nand->chip.controller);
+        struct ingenic_nand_cs *cs;
+        /* Ensure the currently selected chip is deasserted. */
+        if (chipnr == -1 && nfc->selected >= 0) {
+                cs = &nfc->cs[nfc->selected];
+                jz4780_nemc_assert(nfc->dev, cs->bank, false);
+        }
+        nfc->selected = chipnr;
+}
+static void ingenic_nand_cmd_ctrl(struct nand_chip *chip, int cmd,
+                                  unsigned int ctrl)
+{
+        struct ingenic_nand *nand = to_ingenic_nand(nand_to_mtd(chip));
+        struct ingenic_nfc *nfc = to_ingenic_nfc(nand->chip.controller);
+        struct ingenic_nand_cs *cs;
+        if (WARN_ON(nfc->selected < 0))
+                return;
+        cs = &nfc->cs[nfc->selected];
+        jz4780_nemc_assert(nfc->dev, cs->bank, ctrl & NAND_NCE);
+        if (cmd == NAND_CMD_NONE)
+                return;
+        if (ctrl & NAND_ALE)
+                writeb(cmd, cs->base + nfc->soc_info->addr_offset);
+        else if (ctrl & NAND_CLE)
+                writeb(cmd, cs->base + nfc->soc_info->cmd_offset);
+}
+static int ingenic_nand_dev_ready(struct nand_chip *chip)
+{
+        struct ingenic_nand *nand = to_ingenic_nand(nand_to_mtd(chip));
+        return !gpiod_get_value_cansleep(nand->busy_gpio);
+}
+static void ingenic_nand_ecc_hwctl(struct nand_chip *chip, int mode)
+{
+        struct ingenic_nand *nand = to_ingenic_nand(nand_to_mtd(chip));
+        nand->reading = (mode == NAND_ECC_READ);
+}
+static int ingenic_nand_ecc_calculate(struct nand_chip *chip, const u8 *dat,
+                                      u8 *ecc_code)
+{
+        struct ingenic_nand *nand = to_ingenic_nand(nand_to_mtd(chip));
+        struct ingenic_nfc *nfc = to_ingenic_nfc(nand->chip.controller);
+        struct ingenic_ecc_params params;
+        /*
+         * Don't need to generate the ECC when reading, the ECC engine does it
+         * for us as part of decoding/correction.
+         */
+        if (nand->reading)
+                return 0;
+        params.size = nand->chip.ecc.size;
+        params.bytes = nand->chip.ecc.bytes;
+        params.strength = nand->chip.ecc.strength;
+        return ingenic_ecc_calculate(nfc->ecc, &params, dat, ecc_code);
+}
+static int ingenic_nand_ecc_correct(struct nand_chip *chip, u8 *dat,
+                                    u8 *read_ecc, u8 *calc_ecc)
+{
+        struct ingenic_nand *nand = to_ingenic_nand(nand_to_mtd(chip));
+        struct ingenic_nfc *nfc = to_ingenic_nfc(nand->chip.controller);
+        struct ingenic_ecc_params params;
+        params.size = nand->chip.ecc.size;
+        params.bytes = nand->chip.ecc.bytes;
+        params.strength = nand->chip.ecc.strength;
+        return ingenic_ecc_correct(nfc->ecc, &params, dat, read_ecc);
+}
+static int ingenic_nand_attach_chip(struct nand_chip *chip)
+{
+        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct ingenic_nfc *nfc = to_ingenic_nfc(chip->controller);
+        int eccbytes;
+        if (chip->ecc.strength == 4) {
+                /* JZ4740 uses 9 bytes of ECC to correct maximum 4 errors */
+                chip->ecc.bytes = 9;
+        } else {
+                chip->ecc.bytes = fls((1 + 8) * chip->ecc.size) *
+                                  (chip->ecc.strength / 8);
+        }
+        switch (chip->ecc.mode) {
+        case NAND_ECC_HW:
+                if (!nfc->ecc) {
+                        dev_err(nfc->dev, "HW ECC selected, but ECC controller not found\n");
+                        return -ENODEV;
+                }
+                chip->ecc.hwctl = ingenic_nand_ecc_hwctl;
+                chip->ecc.calculate = ingenic_nand_ecc_calculate;
+                chip->ecc.correct = ingenic_nand_ecc_correct;
+                /* fall through */
+        case NAND_ECC_SOFT:
+                dev_info(nfc->dev, "using %s (strength %d, size %d, bytes %d)\n",
+                         (nfc->ecc) ? "hardware ECC" : "software ECC",
+                         chip->ecc.strength, chip->ecc.size, chip->ecc.bytes);
+                break;
+        case NAND_ECC_NONE:
+                dev_info(nfc->dev, "not using ECC\n");
+                break;
+        default:
+                dev_err(nfc->dev, "ECC mode %d not supported\n",
+                        chip->ecc.mode);
+                return -EINVAL;
+        }
+        /* The NAND core will generate the ECC layout for SW ECC */
+        if (chip->ecc.mode != NAND_ECC_HW)
+                return 0;
+        /* Generate ECC layout. ECC codes are right aligned in the OOB area. */
+        eccbytes = mtd->writesize / chip->ecc.size * chip->ecc.bytes;
+        if (eccbytes > mtd->oobsize - 2) {
+                dev_err(nfc->dev,
+                        "invalid ECC config: required %d ECC bytes, but only %d are available",
+                        eccbytes, mtd->oobsize - 2);
+                return -EINVAL;
+        }
+        /*
+         * The generic layout for BBT markers will most likely overlap with our
+         * ECC bytes in the OOB, so move the BBT markers outside the OOB area.
+         */
+        if (chip->bbt_options & NAND_BBT_USE_FLASH)
+                chip->bbt_options |= NAND_BBT_NO_OOB;
+        /* For legacy reasons we use a different layout on the qi,lb60 board. */
+        if (of_machine_is_compatible("qi,lb60"))
+                mtd_set_ooblayout(mtd, &qi_lb60_ooblayout_ops);
+        else
+                mtd_set_ooblayout(mtd, nfc->soc_info->oob_layout);
+        return 0;
+}
+static const struct nand_controller_ops ingenic_nand_controller_ops = {
+        .attach_chip = ingenic_nand_attach_chip,
+};
+static int ingenic_nand_init_chip(struct platform_device *pdev,
+                                  struct ingenic_nfc *nfc,
+                                  struct device_node *np,
+                                  unsigned int chipnr)
+{
+        struct device *dev = &pdev->dev;
+        struct ingenic_nand *nand;
+        struct ingenic_nand_cs *cs;
+        struct resource *res;
+        struct nand_chip *chip;
+        struct mtd_info *mtd;
+        const __be32 *reg;
+        int ret = 0;
+        cs = &nfc->cs[chipnr];
+        reg = of_get_property(np, "reg", NULL);
+        if (!reg)
+                return -EINVAL;
+        cs->bank = be32_to_cpu(*reg);
+        jz4780_nemc_set_type(nfc->dev, cs->bank, JZ4780_NEMC_BANK_NAND);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, chipnr);
+        cs->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(cs->base))
+                return PTR_ERR(cs->base);
+        nand = devm_kzalloc(dev, sizeof(*nand), GFP_KERNEL);
+        if (!nand)
+                return -ENOMEM;
+        nand->busy_gpio = devm_gpiod_get_optional(dev, "rb", GPIOD_IN);
+        if (IS_ERR(nand->busy_gpio)) {
+                ret = PTR_ERR(nand->busy_gpio);
+                dev_err(dev, "failed to request busy GPIO: %d\n", ret);
+                return ret;
+        } else if (nand->busy_gpio) {
+                nand->chip.legacy.dev_ready = ingenic_nand_dev_ready;
+        }
+        nand->wp_gpio = devm_gpiod_get_optional(dev, "wp", GPIOD_OUT_LOW);
+        if (IS_ERR(nand->wp_gpio)) {
+                ret = PTR_ERR(nand->wp_gpio);
+                dev_err(dev, "failed to request WP GPIO: %d\n", ret);
+                return ret;
+        }
+        chip = &nand->chip;
+        mtd = nand_to_mtd(chip);
+        mtd->name = devm_kasprintf(dev, GFP_KERNEL, "%s.%d", dev_name(dev),
+                                   cs->bank);
+        if (!mtd->name)
+                return -ENOMEM;
+        mtd->dev.parent = dev;
+        chip->legacy.IO_ADDR_R = cs->base + nfc->soc_info->data_offset;
+        chip->legacy.IO_ADDR_W = cs->base + nfc->soc_info->data_offset;
+        chip->legacy.chip_delay = RB_DELAY_US;
+        chip->options = NAND_NO_SUBPAGE_WRITE;
+        chip->legacy.select_chip = ingenic_nand_select_chip;
+        chip->legacy.cmd_ctrl = ingenic_nand_cmd_ctrl;
+        chip->ecc.mode = NAND_ECC_HW;
+        chip->controller = &nfc->controller;
+        nand_set_flash_node(chip, np);
+        chip->controller->ops = &ingenic_nand_controller_ops;
+        ret = nand_scan(chip, 1);
+        if (ret)
+                return ret;
+        ret = mtd_device_register(mtd, NULL, 0);
+        if (ret) {
+                nand_release(chip);
+                return ret;
+        }
+        list_add_tail(&nand->chip_list, &nfc->chips);
+        return 0;
+}
+static void ingenic_nand_cleanup_chips(struct ingenic_nfc *nfc)
+{
+        struct ingenic_nand *chip;
+        while (!list_empty(&nfc->chips)) {
+                chip = list_first_entry(&nfc->chips,
+                                        struct ingenic_nand, chip_list);
+                nand_release(&chip->chip);
+                list_del(&chip->chip_list);
+        }
+}
+static int ingenic_nand_init_chips(struct ingenic_nfc *nfc,
+                                   struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct device_node *np;
+        int i = 0;
+        int ret;
+        int num_chips = of_get_child_count(dev->of_node);
+        if (num_chips > nfc->num_banks) {
+                dev_err(dev, "found %d chips but only %d banks\n",
+                        num_chips, nfc->num_banks);
+                return -EINVAL;
+        }
+        for_each_child_of_node(dev->of_node, np) {
+                ret = ingenic_nand_init_chip(pdev, nfc, np, i);
+                if (ret) {
+                        ingenic_nand_cleanup_chips(nfc);
+                        return ret;
+                }
+                i++;
+        }
+        return 0;
+}
+static int ingenic_nand_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        unsigned int num_banks;
+        struct ingenic_nfc *nfc;
+        int ret;
+        num_banks = jz4780_nemc_num_banks(dev);
+        if (num_banks == 0) {
+                dev_err(dev, "no banks found\n");
+                return -ENODEV;
+        }
+        nfc = devm_kzalloc(dev, struct_size(nfc, cs, num_banks), GFP_KERNEL);
+        if (!nfc)
+                return -ENOMEM;
+        nfc->soc_info = device_get_match_data(dev);
+        if (!nfc->soc_info)
+                return -EINVAL;
+        /*
+         * Check for ECC HW before we call nand_scan_ident, to prevent us from
+         * having to call it again if the ECC driver returns -EPROBE_DEFER.
+         */
+        nfc->ecc = of_ingenic_ecc_get(dev->of_node);
+        if (IS_ERR(nfc->ecc))
+                return PTR_ERR(nfc->ecc);
+        nfc->dev = dev;
+        nfc->num_banks = num_banks;
+        nand_controller_init(&nfc->controller);
+        INIT_LIST_HEAD(&nfc->chips);
+        ret = ingenic_nand_init_chips(nfc, pdev);
+        if (ret) {
+                if (nfc->ecc)
+                        ingenic_ecc_release(nfc->ecc);
+                return ret;
+        }
+        platform_set_drvdata(pdev, nfc);
+        return 0;
+}
+static int ingenic_nand_remove(struct platform_device *pdev)
+{
+        struct ingenic_nfc *nfc = platform_get_drvdata(pdev);
+        if (nfc->ecc)
+                ingenic_ecc_release(nfc->ecc);
+        ingenic_nand_cleanup_chips(nfc);
+        return 0;
+}
+static const struct jz_soc_info jz4740_soc_info = {
+        .data_offset = 0x00000000,
+        .cmd_offset = 0x00008000,
+        .addr_offset = 0x00010000,
+        .oob_layout = &nand_ooblayout_lp_ops,
+};
+static const struct jz_soc_info jz4725b_soc_info = {
+        .data_offset = 0x00000000,
+        .cmd_offset = 0x00008000,
+        .addr_offset = 0x00010000,
+        .oob_layout = &jz4725b_ooblayout_ops,
+};
+static const struct jz_soc_info jz4780_soc_info = {
+        .data_offset = 0x00000000,
+        .cmd_offset = 0x00400000,
+        .addr_offset = 0x00800000,
+        .oob_layout = &nand_ooblayout_lp_ops,
+};
+static const struct of_device_id ingenic_nand_dt_match[] = {
+        { .compatible = "ingenic,jz4740-nand", .data = &jz4740_soc_info },
+        { .compatible = "ingenic,jz4725b-nand", .data = &jz4725b_soc_info },
+        { .compatible = "ingenic,jz4780-nand", .data = &jz4780_soc_info },
+        {},
+};
+MODULE_DEVICE_TABLE(of, ingenic_nand_dt_match);
+static struct platform_driver ingenic_nand_driver = {
+        .probe          = ingenic_nand_probe,
+        .remove         = ingenic_nand_remove,
+        .driver = {
+                .name   = DRV_NAME,
+                .of_match_table = of_match_ptr(ingenic_nand_dt_match),
+        },
+};
+module_platform_driver(ingenic_nand_driver);
+MODULE_AUTHOR("Alex Smith <alex@alex-smith.me.uk>");
+MODULE_AUTHOR("Harvey Hunt <harveyhuntnexus@gmail.com>");
+MODULE_DESCRIPTION("Ingenic JZ47xx NAND driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mtd/nand/raw/ingenic/jz4725b_bch.c b/drivers/mtd/nand/raw/ingenic/jz4725b_bch.c
new file mode 100644
index 000000000000..6c852eae09cf
--- /dev/null
+++ b/drivers/mtd/nand/raw/ingenic/jz4725b_bch.c
@@ -0,0 +1,295 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * JZ4725B BCH controller driver
+ *
+ * Copyright (C) 2019 Paul Cercueil <paul@crapouillou.net>
+ *
+ * Based on jz4780_bch.c
+ */
+#include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include "ingenic_ecc.h"
+#define BCH_BHCR                        0x0
+#define BCH_BHCSR                       0x4
+#define BCH_BHCCR                       0x8
+#define BCH_BHCNT                       0xc
+#define BCH_BHDR                        0x10
+#define BCH_BHPAR0                      0x14
+#define BCH_BHERR0                      0x28
+#define BCH_BHINT                       0x24
+#define BCH_BHINTES                     0x3c
+#define BCH_BHINTEC                     0x40
+#define BCH_BHINTE                      0x38
+#define BCH_BHCR_ENCE                   BIT(3)
+#define BCH_BHCR_BSEL                   BIT(2)
+#define BCH_BHCR_INIT                   BIT(1)
+#define BCH_BHCR_BCHE                   BIT(0)
+#define BCH_BHCNT_DEC_COUNT_SHIFT       16
+#define BCH_BHCNT_DEC_COUNT_MASK        (0x3ff << BCH_BHCNT_DEC_COUNT_SHIFT)
+#define BCH_BHCNT_ENC_COUNT_SHIFT       0
+#define BCH_BHCNT_ENC_COUNT_MASK        (0x3ff << BCH_BHCNT_ENC_COUNT_SHIFT)
+#define BCH_BHERR_INDEX0_SHIFT          0
+#define BCH_BHERR_INDEX0_MASK           (0x1fff << BCH_BHERR_INDEX0_SHIFT)
+#define BCH_BHERR_INDEX1_SHIFT          16
+#define BCH_BHERR_INDEX1_MASK           (0x1fff << BCH_BHERR_INDEX1_SHIFT)
+#define BCH_BHINT_ERRC_SHIFT            28
+#define BCH_BHINT_ERRC_MASK             (0xf << BCH_BHINT_ERRC_SHIFT)
+#define BCH_BHINT_TERRC_SHIFT           16
+#define BCH_BHINT_TERRC_MASK            (0x7f << BCH_BHINT_TERRC_SHIFT)
+#define BCH_BHINT_ALL_0                 BIT(5)
+#define BCH_BHINT_ALL_F                 BIT(4)
+#define BCH_BHINT_DECF                  BIT(3)
+#define BCH_BHINT_ENCF                  BIT(2)
+#define BCH_BHINT_UNCOR                 BIT(1)
+#define BCH_BHINT_ERR                   BIT(0)
+/* Timeout for BCH calculation/correction. */
+#define BCH_TIMEOUT_US                  100000
+static inline void jz4725b_bch_config_set(struct ingenic_ecc *bch, u32 cfg)
+{
+        writel(cfg, bch->base + BCH_BHCSR);
+}
+static inline void jz4725b_bch_config_clear(struct ingenic_ecc *bch, u32 cfg)
+{
+        writel(cfg, bch->base + BCH_BHCCR);
+}
+static int jz4725b_bch_reset(struct ingenic_ecc *bch,
+                             struct ingenic_ecc_params *params, bool calc_ecc)
+{
+        u32 reg, max_value;
+        /* Clear interrupt status. */
+        writel(readl(bch->base + BCH_BHINT), bch->base + BCH_BHINT);
+        /* Initialise and enable BCH. */
+        jz4725b_bch_config_clear(bch, 0x1f);
+        jz4725b_bch_config_set(bch, BCH_BHCR_BCHE);
+        if (params->strength == 8)
+                jz4725b_bch_config_set(bch, BCH_BHCR_BSEL);
+        else
+                jz4725b_bch_config_clear(bch, BCH_BHCR_BSEL);
+        if (calc_ecc) /* calculate ECC from data */
+                jz4725b_bch_config_set(bch, BCH_BHCR_ENCE);
+        else /* correct data from ECC */
+                jz4725b_bch_config_clear(bch, BCH_BHCR_ENCE);
+        jz4725b_bch_config_set(bch, BCH_BHCR_INIT);
+        max_value = BCH_BHCNT_ENC_COUNT_MASK >> BCH_BHCNT_ENC_COUNT_SHIFT;
+        if (params->size > max_value)
+                return -EINVAL;
+        max_value = BCH_BHCNT_DEC_COUNT_MASK >> BCH_BHCNT_DEC_COUNT_SHIFT;
+        if (params->size + params->bytes > max_value)
+                return -EINVAL;
+        /* Set up BCH count register. */
+        reg = params->size << BCH_BHCNT_ENC_COUNT_SHIFT;
+        reg |= (params->size + params->bytes) << BCH_BHCNT_DEC_COUNT_SHIFT;
+        writel(reg, bch->base + BCH_BHCNT);
+        return 0;
+}
+static void jz4725b_bch_disable(struct ingenic_ecc *bch)
+{
+        /* Clear interrupts */
+        writel(readl(bch->base + BCH_BHINT), bch->base + BCH_BHINT);
+        /* Disable the hardware */
+        jz4725b_bch_config_clear(bch, BCH_BHCR_BCHE);
+}
+static void jz4725b_bch_write_data(struct ingenic_ecc *bch, const u8 *buf,
+                                   size_t size)
+{
+        while (size--)
+                writeb(*buf++, bch->base + BCH_BHDR);
+}
+static void jz4725b_bch_read_parity(struct ingenic_ecc *bch, u8 *buf,
+                                    size_t size)
+{
+        size_t size32 = size / sizeof(u32);
+        size_t size8 = size % sizeof(u32);
+        u32 *dest32;
+        u8 *dest8;
+        u32 val, offset = 0;
+        dest32 = (u32 *)buf;
+        while (size32--) {
+                *dest32++ = readl_relaxed(bch->base + BCH_BHPAR0 + offset);
+                offset += sizeof(u32);
+        }
+        dest8 = (u8 *)dest32;
+        val = readl_relaxed(bch->base + BCH_BHPAR0 + offset);
+        switch (size8) {
+        case 3:
+                dest8[2] = (val >> 16) & 0xff;
+                /* fall-through */
+        case 2:
+                dest8[1] = (val >> 8) & 0xff;
+                /* fall-through */
+        case 1:
+                dest8[0] = val & 0xff;
+                break;
+        }
+}
+static int jz4725b_bch_wait_complete(struct ingenic_ecc *bch, unsigned int irq,
+                                     u32 *status)
+{
+        u32 reg;
+        int ret;
+        /*
+         * While we could use interrupts here and sleep until the operation
+         * completes, the controller works fairly quickly (usually a few
+         * microseconds) and so the overhead of sleeping until we get an
+         * interrupt quite noticeably decreases performance.
+         */
+        ret = readl_relaxed_poll_timeout(bch->base + BCH_BHINT, reg,
+                                         reg & irq, 0, BCH_TIMEOUT_US);
+        if (ret)
+                return ret;
+        if (status)
+                *status = reg;
+        writel(reg, bch->base + BCH_BHINT);
+        return 0;
+}
+static int jz4725b_calculate(struct ingenic_ecc *bch,
+                             struct ingenic_ecc_params *params,
+                             const u8 *buf, u8 *ecc_code)
+{
+        int ret;
+        mutex_lock(&bch->lock);
+        ret = jz4725b_bch_reset(bch, params, true);
+        if (ret) {
+                dev_err(bch->dev, "Unable to init BCH with given parameters\n");
+                goto out_disable;
+        }
+        jz4725b_bch_write_data(bch, buf, params->size);
+        ret = jz4725b_bch_wait_complete(bch, BCH_BHINT_ENCF, NULL);
+        if (ret) {
+                dev_err(bch->dev, "timed out while calculating ECC\n");
+                goto out_disable;
+        }
+        jz4725b_bch_read_parity(bch, ecc_code, params->bytes);
+out_disable:
+        jz4725b_bch_disable(bch);
+        mutex_unlock(&bch->lock);
+        return ret;
+}
+static int jz4725b_correct(struct ingenic_ecc *bch,
+                           struct ingenic_ecc_params *params,
+                           u8 *buf, u8 *ecc_code)
+{
+        u32 reg, errors, bit;
+        unsigned int i;
+        int ret;
+        mutex_lock(&bch->lock);
+        ret = jz4725b_bch_reset(bch, params, false);
+        if (ret) {
+                dev_err(bch->dev, "Unable to init BCH with given parameters\n");
+                goto out;
+        }
+        jz4725b_bch_write_data(bch, buf, params->size);
+        jz4725b_bch_write_data(bch, ecc_code, params->bytes);
+        ret = jz4725b_bch_wait_complete(bch, BCH_BHINT_DECF, &reg);
+        if (ret) {
+                dev_err(bch->dev, "timed out while correcting data\n");
+                goto out;
+        }
+        if (reg & (BCH_BHINT_ALL_F | BCH_BHINT_ALL_0)) {
+                /* Data and ECC is all 0xff or 0x00 - nothing to correct */
+                ret = 0;
+                goto out;
+        }
+        if (reg & BCH_BHINT_UNCOR) {
+                /* Uncorrectable ECC error */
+                ret = -EBADMSG;
+                goto out;
+        }
+        errors = (reg & BCH_BHINT_ERRC_MASK) >> BCH_BHINT_ERRC_SHIFT;
+        /* Correct any detected errors. */
+        for (i = 0; i < errors; i++) {
+                if (i & 1) {
+                        bit = (reg & BCH_BHERR_INDEX1_MASK) >> BCH_BHERR_INDEX1_SHIFT;
+                } else {
+                        reg = readl(bch->base + BCH_BHERR0 + (i * 4));
+                        bit = (reg & BCH_BHERR_INDEX0_MASK) >> BCH_BHERR_INDEX0_SHIFT;
+                }
+                buf[(bit >> 3)] ^= BIT(bit & 0x7);
+        }
+out:
+        jz4725b_bch_disable(bch);
+        mutex_unlock(&bch->lock);
+        return ret;
+}
+static const struct ingenic_ecc_ops jz4725b_bch_ops = {
+        .disable = jz4725b_bch_disable,
+        .calculate = jz4725b_calculate,
+        .correct = jz4725b_correct,
+};
+static const struct of_device_id jz4725b_bch_dt_match[] = {
+        { .compatible = "ingenic,jz4725b-bch", .data = &jz4725b_bch_ops },
+        {},
+};
+MODULE_DEVICE_TABLE(of, jz4725b_bch_dt_match);
+static struct platform_driver jz4725b_bch_driver = {
+        .probe          = ingenic_ecc_probe,
+        .driver = {
+                .name   = "jz4725b-bch",
+                .of_match_table = jz4725b_bch_dt_match,
+        },
+};
+module_platform_driver(jz4725b_bch_driver);
+MODULE_AUTHOR("Paul Cercueil <paul@crapouillou.net>");
+MODULE_DESCRIPTION("Ingenic JZ4725B BCH controller driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mtd/nand/raw/ingenic/jz4740_ecc.c b/drivers/mtd/nand/raw/ingenic/jz4740_ecc.c
new file mode 100644
index 000000000000..13fea645c7f0
--- /dev/null
+++ b/drivers/mtd/nand/raw/ingenic/jz4740_ecc.c
@@ -0,0 +1,197 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * JZ4740 ECC controller driver
+ *
+ * Copyright (c) 2019 Paul Cercueil <paul@crapouillou.net>
+ *
+ * based on jz4740-nand.c
+ */
+#include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include "ingenic_ecc.h"
+#define JZ_REG_NAND_ECC_CTRL    0x00
+#define JZ_REG_NAND_DATA        0x04
+#define JZ_REG_NAND_PAR0        0x08
+#define JZ_REG_NAND_PAR1        0x0C
+#define JZ_REG_NAND_PAR2        0x10
+#define JZ_REG_NAND_IRQ_STAT    0x14
+#define JZ_REG_NAND_IRQ_CTRL    0x18
+#define JZ_REG_NAND_ERR(x)      (0x1C + ((x) << 2))
+#define JZ_NAND_ECC_CTRL_PAR_READY      BIT(4)
+#define JZ_NAND_ECC_CTRL_ENCODING       BIT(3)
+#define JZ_NAND_ECC_CTRL_RS             BIT(2)
+#define JZ_NAND_ECC_CTRL_RESET          BIT(1)
+#define JZ_NAND_ECC_CTRL_ENABLE         BIT(0)
+#define JZ_NAND_STATUS_ERR_COUNT        (BIT(31) | BIT(30) | BIT(29))
+#define JZ_NAND_STATUS_PAD_FINISH       BIT(4)
+#define JZ_NAND_STATUS_DEC_FINISH       BIT(3)
+#define JZ_NAND_STATUS_ENC_FINISH       BIT(2)
+#define JZ_NAND_STATUS_UNCOR_ERROR      BIT(1)
+#define JZ_NAND_STATUS_ERROR            BIT(0)
+static const uint8_t empty_block_ecc[] = {
+        0xcd, 0x9d, 0x90, 0x58, 0xf4, 0x8b, 0xff, 0xb7, 0x6f
+};
+static void jz4740_ecc_reset(struct ingenic_ecc *ecc, bool calc_ecc)
+{
+        uint32_t reg;
+        /* Clear interrupt status */
+        writel(0, ecc->base + JZ_REG_NAND_IRQ_STAT);
+        /* Initialize and enable ECC hardware */
+        reg = readl(ecc->base + JZ_REG_NAND_ECC_CTRL);
+        reg |= JZ_NAND_ECC_CTRL_RESET;
+        reg |= JZ_NAND_ECC_CTRL_ENABLE;
+        reg |= JZ_NAND_ECC_CTRL_RS;
+        if (calc_ecc) /* calculate ECC from data */
+                reg |= JZ_NAND_ECC_CTRL_ENCODING;
+        else /* correct data from ECC */
+                reg &= ~JZ_NAND_ECC_CTRL_ENCODING;
+        writel(reg, ecc->base + JZ_REG_NAND_ECC_CTRL);
+}
+static int jz4740_ecc_calculate(struct ingenic_ecc *ecc,
+                                struct ingenic_ecc_params *params,
+                                const u8 *buf, u8 *ecc_code)
+{
+        uint32_t reg, status;
+        unsigned int timeout = 1000;
+        int i;
+        jz4740_ecc_reset(ecc, true);
+        do {
+                status = readl(ecc->base + JZ_REG_NAND_IRQ_STAT);
+        } while (!(status & JZ_NAND_STATUS_ENC_FINISH) && --timeout);
+        if (timeout == 0)
+                return -ETIMEDOUT;
+        reg = readl(ecc->base + JZ_REG_NAND_ECC_CTRL);
+        reg &= ~JZ_NAND_ECC_CTRL_ENABLE;
+        writel(reg, ecc->base + JZ_REG_NAND_ECC_CTRL);
+        for (i = 0; i < params->bytes; ++i)
+                ecc_code[i] = readb(ecc->base + JZ_REG_NAND_PAR0 + i);
+        /*
+         * If the written data is completely 0xff, we also want to write 0xff as
+         * ECC, otherwise we will get in trouble when doing subpage writes.
+         */
+        if (memcmp(ecc_code, empty_block_ecc, ARRAY_SIZE(empty_block_ecc)) == 0)
+                memset(ecc_code, 0xff, ARRAY_SIZE(empty_block_ecc));
+        return 0;
+}
+static void jz_nand_correct_data(uint8_t *buf, int index, int mask)
+{
+        int offset = index & 0x7;
+        uint16_t data;
+        index += (index >> 3);
+        data = buf[index];
+        data |= buf[index + 1] << 8;
+        mask ^= (data >> offset) & 0x1ff;
+        data &= ~(0x1ff << offset);
+        data |= (mask << offset);
+        buf[index] = data & 0xff;
+        buf[index + 1] = (data >> 8) & 0xff;
+}
+static int jz4740_ecc_correct(struct ingenic_ecc *ecc,
+                              struct ingenic_ecc_params *params,
+                              u8 *buf, u8 *ecc_code)
+{
+        int i, error_count, index;
+        uint32_t reg, status, error;
+        unsigned int timeout = 1000;
+        jz4740_ecc_reset(ecc, false);
+        for (i = 0; i < params->bytes; ++i)
+                writeb(ecc_code[i], ecc->base + JZ_REG_NAND_PAR0 + i);
+        reg = readl(ecc->base + JZ_REG_NAND_ECC_CTRL);
+        reg |= JZ_NAND_ECC_CTRL_PAR_READY;
+        writel(reg, ecc->base + JZ_REG_NAND_ECC_CTRL);
+        do {
+                status = readl(ecc->base + JZ_REG_NAND_IRQ_STAT);
+        } while (!(status & JZ_NAND_STATUS_DEC_FINISH) && --timeout);
+        if (timeout == 0)
+                return -ETIMEDOUT;
+        reg = readl(ecc->base + JZ_REG_NAND_ECC_CTRL);
+        reg &= ~JZ_NAND_ECC_CTRL_ENABLE;
+        writel(reg, ecc->base + JZ_REG_NAND_ECC_CTRL);
+        if (status & JZ_NAND_STATUS_ERROR) {
+                if (status & JZ_NAND_STATUS_UNCOR_ERROR)
+                        return -EBADMSG;
+                error_count = (status & JZ_NAND_STATUS_ERR_COUNT) >> 29;
+                for (i = 0; i < error_count; ++i) {
+                        error = readl(ecc->base + JZ_REG_NAND_ERR(i));
+                        index = ((error >> 16) & 0x1ff) - 1;
+                        if (index >= 0 && index < params->size)
+                                jz_nand_correct_data(buf, index, error & 0x1ff);
+                }
+                return error_count;
+        }
+        return 0;
+}
+static void jz4740_ecc_disable(struct ingenic_ecc *ecc)
+{
+        u32 reg;
+        writel(0, ecc->base + JZ_REG_NAND_IRQ_STAT);
+        reg = readl(ecc->base + JZ_REG_NAND_ECC_CTRL);
+        reg &= ~JZ_NAND_ECC_CTRL_ENABLE;
+        writel(reg, ecc->base + JZ_REG_NAND_ECC_CTRL);
+}
+static const struct ingenic_ecc_ops jz4740_ecc_ops = {
+        .disable = jz4740_ecc_disable,
+        .calculate = jz4740_ecc_calculate,
+        .correct = jz4740_ecc_correct,
+};
+static const struct of_device_id jz4740_ecc_dt_match[] = {
+        { .compatible = "ingenic,jz4740-ecc", .data = &jz4740_ecc_ops },
+        {},
+};
+MODULE_DEVICE_TABLE(of, jz4740_ecc_dt_match);
+static struct platform_driver jz4740_ecc_driver = {
+        .probe          = ingenic_ecc_probe,
+        .driver = {
+                .name   = "jz4740-ecc",
+                .of_match_table = jz4740_ecc_dt_match,
+        },
+};
+module_platform_driver(jz4740_ecc_driver);
+MODULE_AUTHOR("Paul Cercueil <paul@crapouillou.net>");
+MODULE_DESCRIPTION("Ingenic JZ4740 ECC controller driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mtd/nand/raw/jz4740_nand.c b/drivers/mtd/nand/raw/ingenic/jz4740_nand.c
index 9526d5b23c80..f759f1672855 100644
--- a/drivers/mtd/nand/raw/jz4740_nand.c
+++ b/drivers/mtd/nand/raw/ingenic/jz4740_nand.c
@@ -313,8 +313,11 @@ static int jz_nand_detect_bank(struct platform_device *pdev,
        uint32_t ctrl;
        struct nand_chip *chip = &nand->chip;
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
        u8 id[2];
+        memorg = nanddev_get_memorg(&chip->base);
        /* Request I/O resource. */
        sprintf(res_name, "bank%d", bank);
        ret = jz_nand_ioremap_resource(pdev, res_name,
@@ -351,8 +354,8 @@ static int jz_nand_detect_bank(struct platform_device *pdev,
                }
                /* Update size of the MTD. */
-                chip->numchips++;
+                memorg->ntargets++;
-                mtd->size += chip->chipsize;
+                mtd->size += nanddev_target_size(&chip->base);
        }
        dev_info(&pdev->dev, "Found chip %zu on bank %i\n", chipnr, bank);
diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/ingenic/jz4780_bch.c
index c5f74ed85862..079266a0d6cf 100644
--- a/drivers/mtd/nand/raw/jz4780_bch.c
+++ b/drivers/mtd/nand/raw/ingenic/jz4780_bch.c
@@ -1,28 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * JZ4780 BCH controller
+ * JZ4780 BCH controller driver
 *
 * Copyright (c) 2015 Imagination Technologies
 * Author: Alex Smith <alex.smith@imgtec.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
 */
 #include <linux/bitops.h>
 #include <linux/clk.h>
-#include <linux/delay.h>
+#include <linux/device.h>
-#include <linux/init.h>
+#include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
-#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include "jz4780_bch.h"
+#include "ingenic_ecc.h"
 #define BCH_BHCR                        0x0
 #define BCH_BHCCR                       0x8
@@ -65,15 +59,8 @@
 /* Timeout for BCH calculation/correction. */
 #define BCH_TIMEOUT_US                  100000
-struct jz4780_bch {
+static void jz4780_bch_reset(struct ingenic_ecc *bch,
-        struct device *dev;
+                             struct ingenic_ecc_params *params, bool encode)
-        void __iomem *base;
-        struct clk *clk;
-        struct mutex lock;
-};
-static void jz4780_bch_init(struct jz4780_bch *bch,
-                            struct jz4780_bch_params *params, bool encode)
 {
        u32 reg;
@@ -93,13 +80,13 @@ static void jz4780_bch_init(struct jz4780_bch *bch,
        writel(reg, bch->base + BCH_BHCR);
 }
-static void jz4780_bch_disable(struct jz4780_bch *bch)
+static void jz4780_bch_disable(struct ingenic_ecc *bch)
 {
        writel(readl(bch->base + BCH_BHINT), bch->base + BCH_BHINT);
        writel(BCH_BHCR_BCHE, bch->base + BCH_BHCCR);
 }
-static void jz4780_bch_write_data(struct jz4780_bch *bch, const void *buf,
+static void jz4780_bch_write_data(struct ingenic_ecc *bch, const void *buf,
                                  size_t size)
 {
        size_t size32 = size / sizeof(u32);
@@ -116,7 +103,7 @@ static void jz4780_bch_write_data(struct jz4780_bch *bch, const void *buf,
                writeb(*src8++, bch->base + BCH_BHDR);
 }
-static void jz4780_bch_read_parity(struct jz4780_bch *bch, void *buf,
+static void jz4780_bch_read_parity(struct ingenic_ecc *bch, void *buf,
                                   size_t size)
 {
        size_t size32 = size / sizeof(u32);
@@ -146,7 +133,7 @@ static void jz4780_bch_read_parity(struct jz4780_bch *bch, void *buf,
        }
 }
-static bool jz4780_bch_wait_complete(struct jz4780_bch *bch, unsigned int irq,
+static bool jz4780_bch_wait_complete(struct ingenic_ecc *bch, unsigned int irq,
                                     u32 *status)
 {
        u32 reg;
@@ -170,23 +157,15 @@ static bool jz4780_bch_wait_complete(struct jz4780_bch *bch, unsigned int irq,
        return true;
 }
-/**
+static int jz4780_calculate(struct ingenic_ecc *bch,
- * jz4780_bch_calculate() - calculate ECC for a data buffer
+                            struct ingenic_ecc_params *params,
- * @bch: BCH device.
+                            const u8 *buf, u8 *ecc_code)
- * @params: BCH parameters.
- * @buf: input buffer with raw data.
- * @ecc_code: output buffer with ECC.
- *
- * Return: 0 on success, -ETIMEDOUT if timed out while waiting for BCH
- * controller.
- */
-int jz4780_bch_calculate(struct jz4780_bch *bch, struct jz4780_bch_params *params,
-                         const u8 *buf, u8 *ecc_code)
 {
        int ret = 0;
        mutex_lock(&bch->lock);
-        jz4780_bch_init(bch, params, true);
+        jz4780_bch_reset(bch, params, true);
        jz4780_bch_write_data(bch, buf, params->size);
        if (jz4780_bch_wait_complete(bch, BCH_BHINT_ENCF, NULL)) {
@@ -200,30 +179,17 @@ int jz4780_bch_calculate(struct jz4780_bch *bch, struct jz4780_bch_params *param
        mutex_unlock(&bch->lock);
        return ret;
 }
-EXPORT_SYMBOL(jz4780_bch_calculate);
+static int jz4780_correct(struct ingenic_ecc *bch,
-/**
+                          struct ingenic_ecc_params *params,
- * jz4780_bch_correct() - detect and correct bit errors
+                          u8 *buf, u8 *ecc_code)
- * @bch: BCH device.
- * @params: BCH parameters.
- * @buf: raw data read from the chip.
- * @ecc_code: ECC read from the chip.
- *
- * Given the raw data and the ECC read from the NAND device, detects and
- * corrects errors in the data.
- *
- * Return: the number of bit errors corrected, -EBADMSG if there are too many
- * errors to correct or -ETIMEDOUT if we timed out waiting for the controller.
- */
-int jz4780_bch_correct(struct jz4780_bch *bch, struct jz4780_bch_params *params,
-                       u8 *buf, u8 *ecc_code)
 {
        u32 reg, mask, index;
        int i, ret, count;
        mutex_lock(&bch->lock);
-        jz4780_bch_init(bch, params, false);
+        jz4780_bch_reset(bch, params, false);
        jz4780_bch_write_data(bch, buf, params->size);
        jz4780_bch_write_data(bch, ecc_code, params->bytes);
@@ -262,110 +228,30 @@ out:
        mutex_unlock(&bch->lock);
        return ret;
 }
-EXPORT_SYMBOL(jz4780_bch_correct);
-/**
- * jz4780_bch_get() - get the BCH controller device
- * @np: BCH device tree node.
- *
- * Gets the BCH controller device from the specified device tree node. The
- * device must be released with jz4780_bch_release() when it is no longer being
- * used.
- *
- * Return: a pointer to jz4780_bch, errors are encoded into the pointer.
- * PTR_ERR(-EPROBE_DEFER) if the device hasn't been initialised yet.
- */
-static struct jz4780_bch *jz4780_bch_get(struct device_node *np)
-{
-        struct platform_device *pdev;
-        struct jz4780_bch *bch;
-        pdev = of_find_device_by_node(np);
-        if (!pdev)
-                return ERR_PTR(-EPROBE_DEFER);
-        bch = platform_get_drvdata(pdev);
-        if (!bch) {
-                put_device(&pdev->dev);
-                return ERR_PTR(-EPROBE_DEFER);
-        }
-        clk_prepare_enable(bch->clk);
-        return bch;
-}
-/**
- * of_jz4780_bch_get() - get the BCH controller from a DT node
- * @of_node: the node that contains a bch-controller property.
- *
- * Get the bch-controller property from the given device tree
- * node and pass it to jz4780_bch_get to do the work.
- *
- * Return: a pointer to jz4780_bch, errors are encoded into the pointer.
- * PTR_ERR(-EPROBE_DEFER) if the device hasn't been initialised yet.
- */
-struct jz4780_bch *of_jz4780_bch_get(struct device_node *of_node)
-{
-        struct jz4780_bch *bch = NULL;
-        struct device_node *np;
-        np = of_parse_phandle(of_node, "ingenic,bch-controller", 0);
-        if (np) {
-                bch = jz4780_bch_get(np);
-                of_node_put(np);
-        }
-        return bch;
-}
-EXPORT_SYMBOL(of_jz4780_bch_get);
-/**
- * jz4780_bch_release() - release the BCH controller device
- * @bch: BCH device.
- */
-void jz4780_bch_release(struct jz4780_bch *bch)
-{
-        clk_disable_unprepare(bch->clk);
-        put_device(bch->dev);
-}
-EXPORT_SYMBOL(jz4780_bch_release);
 static int jz4780_bch_probe(struct platform_device *pdev)
 {
-        struct device *dev = &pdev->dev;
+        struct ingenic_ecc *bch;
-        struct jz4780_bch *bch;
+        int ret;
-        struct resource *res;
-        bch = devm_kzalloc(dev, sizeof(*bch), GFP_KERNEL);
-        if (!bch)
-                return -ENOMEM;
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        bch->base = devm_ioremap_resource(dev, res);
-        if (IS_ERR(bch->base))
-                return PTR_ERR(bch->base);
-        jz4780_bch_disable(bch);
-        bch->clk = devm_clk_get(dev, NULL);
+        ret = ingenic_ecc_probe(pdev);
-        if (IS_ERR(bch->clk)) {
+        if (ret)
-                dev_err(dev, "failed to get clock: %ld\n", PTR_ERR(bch->clk));
+                return ret;
-                return PTR_ERR(bch->clk);
-        }
+        bch = platform_get_drvdata(pdev);
        clk_set_rate(bch->clk, BCH_CLK_RATE);
-        mutex_init(&bch->lock);
-        bch->dev = dev;
-        platform_set_drvdata(pdev, bch);
        return 0;
 }
+static const struct ingenic_ecc_ops jz4780_bch_ops = {
+        .disable = jz4780_bch_disable,
+        .calculate = jz4780_calculate,
+        .correct = jz4780_correct,
+};
 static const struct of_device_id jz4780_bch_dt_match[] = {
-        { .compatible = "ingenic,jz4780-bch" },
+        { .compatible = "ingenic,jz4780-bch", .data = &jz4780_bch_ops },
        {},
 };
 MODULE_DEVICE_TABLE(of, jz4780_bch_dt_match);
diff --git a/drivers/mtd/nand/raw/internals.h b/drivers/mtd/nand/raw/internals.h
index fbf6ca015cd7..cba6fe7dd8c4 100644
--- a/drivers/mtd/nand/raw/internals.h
+++ b/drivers/mtd/nand/raw/internals.h
@@ -76,6 +76,7 @@ extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;
 /* Core functions */
 const struct nand_manufacturer *nand_get_manufacturer(u8 id);
+int nand_bbm_get_next_page(struct nand_chip *chip, int page);
 int nand_markbad_bbm(struct nand_chip *chip, loff_t ofs);
 int nand_erase_nand(struct nand_chip *chip, struct erase_info *instr,
                    int allowbbt);
@@ -110,7 +111,7 @@ static inline int nand_exec_op(struct nand_chip *chip,
        if (!nand_has_exec_op(chip))
                return -ENOTSUPP;
-        if (WARN_ON(op->cs >= chip->numchips))
+        if (WARN_ON(op->cs >= nanddev_ntargets(&chip->base)))
                return -EINVAL;
        return chip->controller->ops->exec_op(chip, op, false);
diff --git a/drivers/mtd/nand/raw/jz4780_bch.h b/drivers/mtd/nand/raw/jz4780_bch.h
deleted file mode 100644
index bf4718088a3a..000000000000
--- a/drivers/mtd/nand/raw/jz4780_bch.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * JZ4780 BCH controller
- *
- * Copyright (c) 2015 Imagination Technologies
- * Author: Alex Smith <alex.smith@imgtec.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-#ifndef __DRIVERS_MTD_NAND_JZ4780_BCH_H__
-#define __DRIVERS_MTD_NAND_JZ4780_BCH_H__
-#include <linux/types.h>
-struct device;
-struct device_node;
-struct jz4780_bch;
-/**
- * struct jz4780_bch_params - BCH parameters
- * @size: data bytes per ECC step.
- * @bytes: ECC bytes per step.
- * @strength: number of correctable bits per ECC step.
- */
-struct jz4780_bch_params {
-        int size;
-        int bytes;
-        int strength;
-};
-int jz4780_bch_calculate(struct jz4780_bch *bch,
-                                struct jz4780_bch_params *params,
-                                const u8 *buf, u8 *ecc_code);
-int jz4780_bch_correct(struct jz4780_bch *bch,
-                              struct jz4780_bch_params *params, u8 *buf,
-                              u8 *ecc_code);
-void jz4780_bch_release(struct jz4780_bch *bch);
-struct jz4780_bch *of_jz4780_bch_get(struct device_node *np);
-#endif /* __DRIVERS_MTD_NAND_JZ4780_BCH_H__ */
diff --git a/drivers/mtd/nand/raw/jz4780_nand.c b/drivers/mtd/nand/raw/jz4780_nand.c
deleted file mode 100644
index 22e58975f0d5..000000000000
--- a/drivers/mtd/nand/raw/jz4780_nand.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * JZ4780 NAND driver
- *
- * Copyright (c) 2015 Imagination Technologies
- * Author: Alex Smith <alex.smith@imgtec.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/list.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/gpio/consumer.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/rawnand.h>
-#include <linux/mtd/partitions.h>
-#include <linux/jz4780-nemc.h>
-#include "jz4780_bch.h"
-#define DRV_NAME        "jz4780-nand"
-#define OFFSET_DATA     0x00000000
-#define OFFSET_CMD      0x00400000
-#define OFFSET_ADDR     0x00800000
-/* Command delay when there is no R/B pin. */
-#define RB_DELAY_US     100
-struct jz4780_nand_cs {
-        unsigned int bank;
-        void __iomem *base;
-};
-struct jz4780_nand_controller {
-        struct device *dev;
-        struct jz4780_bch *bch;
-        struct nand_controller controller;
-        unsigned int num_banks;
-        struct list_head chips;
-        int selected;
-        struct jz4780_nand_cs cs[];
-};
-struct jz4780_nand_chip {
-        struct nand_chip chip;
-        struct list_head chip_list;
-        struct gpio_desc *busy_gpio;
-        struct gpio_desc *wp_gpio;
-        unsigned int reading: 1;
-};
-static inline struct jz4780_nand_chip *to_jz4780_nand_chip(struct mtd_info *mtd)
-{
-        return container_of(mtd_to_nand(mtd), struct jz4780_nand_chip, chip);
-}
-static inline struct jz4780_nand_controller
-*to_jz4780_nand_controller(struct nand_controller *ctrl)
-{
-        return container_of(ctrl, struct jz4780_nand_controller, controller);
-}
-static void jz4780_nand_select_chip(struct nand_chip *chip, int chipnr)
-{
-        struct jz4780_nand_chip *nand = to_jz4780_nand_chip(nand_to_mtd(chip));
-        struct jz4780_nand_controller *nfc = to_jz4780_nand_controller(nand->chip.controller);
-        struct jz4780_nand_cs *cs;
-        /* Ensure the currently selected chip is deasserted. */
-        if (chipnr == -1 && nfc->selected >= 0) {
-                cs = &nfc->cs[nfc->selected];
-                jz4780_nemc_assert(nfc->dev, cs->bank, false);
-        }
-        nfc->selected = chipnr;
-}
-static void jz4780_nand_cmd_ctrl(struct nand_chip *chip, int cmd,
-                                 unsigned int ctrl)
-{
-        struct jz4780_nand_chip *nand = to_jz4780_nand_chip(nand_to_mtd(chip));
-        struct jz4780_nand_controller *nfc = to_jz4780_nand_controller(nand->chip.controller);
-        struct jz4780_nand_cs *cs;
-        if (WARN_ON(nfc->selected < 0))
-                return;
-        cs = &nfc->cs[nfc->selected];
-        jz4780_nemc_assert(nfc->dev, cs->bank, ctrl & NAND_NCE);
-        if (cmd == NAND_CMD_NONE)
-                return;
-        if (ctrl & NAND_ALE)
-                writeb(cmd, cs->base + OFFSET_ADDR);
-        else if (ctrl & NAND_CLE)
-                writeb(cmd, cs->base + OFFSET_CMD);
-}
-static int jz4780_nand_dev_ready(struct nand_chip *chip)
-{
-        struct jz4780_nand_chip *nand = to_jz4780_nand_chip(nand_to_mtd(chip));
-        return !gpiod_get_value_cansleep(nand->busy_gpio);
-}
-static void jz4780_nand_ecc_hwctl(struct nand_chip *chip, int mode)
-{
-        struct jz4780_nand_chip *nand = to_jz4780_nand_chip(nand_to_mtd(chip));
-        nand->reading = (mode == NAND_ECC_READ);
-}
-static int jz4780_nand_ecc_calculate(struct nand_chip *chip, const u8 *dat,
-                                     u8 *ecc_code)
-{
-        struct jz4780_nand_chip *nand = to_jz4780_nand_chip(nand_to_mtd(chip));
-        struct jz4780_nand_controller *nfc = to_jz4780_nand_controller(nand->chip.controller);
-        struct jz4780_bch_params params;
-        /*
-         * Don't need to generate the ECC when reading, BCH does it for us as
-         * part of decoding/correction.
-         */
-        if (nand->reading)
-                return 0;
-        params.size = nand->chip.ecc.size;
-        params.bytes = nand->chip.ecc.bytes;
-        params.strength = nand->chip.ecc.strength;
-        return jz4780_bch_calculate(nfc->bch, &params, dat, ecc_code);
-}
-static int jz4780_nand_ecc_correct(struct nand_chip *chip, u8 *dat,
-                                   u8 *read_ecc, u8 *calc_ecc)
-{
-        struct jz4780_nand_chip *nand = to_jz4780_nand_chip(nand_to_mtd(chip));
-        struct jz4780_nand_controller *nfc = to_jz4780_nand_controller(nand->chip.controller);
-        struct jz4780_bch_params params;
-        params.size = nand->chip.ecc.size;
-        params.bytes = nand->chip.ecc.bytes;
-        params.strength = nand->chip.ecc.strength;
-        return jz4780_bch_correct(nfc->bch, &params, dat, read_ecc);
-}
-static int jz4780_nand_attach_chip(struct nand_chip *chip)
-{
-        struct mtd_info *mtd = nand_to_mtd(chip);
-        struct jz4780_nand_controller *nfc = to_jz4780_nand_controller(chip->controller);
-        int eccbytes;
-        chip->ecc.bytes = fls((1 + 8) * chip->ecc.size) *
-                                (chip->ecc.strength / 8);
-        switch (chip->ecc.mode) {
-        case NAND_ECC_HW:
-                if (!nfc->bch) {
-                        dev_err(nfc->dev,
-                                "HW BCH selected, but BCH controller not found\n");
-                        return -ENODEV;
-                }
-                chip->ecc.hwctl = jz4780_nand_ecc_hwctl;
-                chip->ecc.calculate = jz4780_nand_ecc_calculate;
-                chip->ecc.correct = jz4780_nand_ecc_correct;
-                /* fall through */
-        case NAND_ECC_SOFT:
-                dev_info(nfc->dev, "using %s (strength %d, size %d, bytes %d)\n",
-                         (nfc->bch) ? "hardware BCH" : "software ECC",
-                         chip->ecc.strength, chip->ecc.size, chip->ecc.bytes);
-                break;
-        case NAND_ECC_NONE:
-                dev_info(nfc->dev, "not using ECC\n");
-                break;
-        default:
-                dev_err(nfc->dev, "ECC mode %d not supported\n",
-                        chip->ecc.mode);
-                return -EINVAL;
-        }
-        /* The NAND core will generate the ECC layout for SW ECC */
-        if (chip->ecc.mode != NAND_ECC_HW)
-                return 0;
-        /* Generate ECC layout. ECC codes are right aligned in the OOB area. */
-        eccbytes = mtd->writesize / chip->ecc.size * chip->ecc.bytes;
-        if (eccbytes > mtd->oobsize - 2) {
-                dev_err(nfc->dev,
-                        "invalid ECC config: required %d ECC bytes, but only %d are available",
-                        eccbytes, mtd->oobsize - 2);
-                return -EINVAL;
-        }
-        mtd_set_ooblayout(mtd, &nand_ooblayout_lp_ops);
-        return 0;
-}
-static const struct nand_controller_ops jz4780_nand_controller_ops = {
-        .attach_chip = jz4780_nand_attach_chip,
-};
-static int jz4780_nand_init_chip(struct platform_device *pdev,
-                                struct jz4780_nand_controller *nfc,
-                                struct device_node *np,
-                                unsigned int chipnr)
-{
-        struct device *dev = &pdev->dev;
-        struct jz4780_nand_chip *nand;
-        struct jz4780_nand_cs *cs;
-        struct resource *res;
-        struct nand_chip *chip;
-        struct mtd_info *mtd;
-        const __be32 *reg;
-        int ret = 0;
-        cs = &nfc->cs[chipnr];
-        reg = of_get_property(np, "reg", NULL);
-        if (!reg)
-                return -EINVAL;
-        cs->bank = be32_to_cpu(*reg);
-        jz4780_nemc_set_type(nfc->dev, cs->bank, JZ4780_NEMC_BANK_NAND);
-        res = platform_get_resource(pdev, IORESOURCE_MEM, chipnr);
-        cs->base = devm_ioremap_resource(dev, res);
-        if (IS_ERR(cs->base))
-                return PTR_ERR(cs->base);
-        nand = devm_kzalloc(dev, sizeof(*nand), GFP_KERNEL);
-        if (!nand)
-                return -ENOMEM;
-        nand->busy_gpio = devm_gpiod_get_optional(dev, "rb", GPIOD_IN);
-        if (IS_ERR(nand->busy_gpio)) {
-                ret = PTR_ERR(nand->busy_gpio);
-                dev_err(dev, "failed to request busy GPIO: %d\n", ret);
-                return ret;
-        } else if (nand->busy_gpio) {
-                nand->chip.legacy.dev_ready = jz4780_nand_dev_ready;
-        }
-        nand->wp_gpio = devm_gpiod_get_optional(dev, "wp", GPIOD_OUT_LOW);
-        if (IS_ERR(nand->wp_gpio)) {
-                ret = PTR_ERR(nand->wp_gpio);
-                dev_err(dev, "failed to request WP GPIO: %d\n", ret);
-                return ret;
-        }
-        chip = &nand->chip;
-        mtd = nand_to_mtd(chip);
-        mtd->name = devm_kasprintf(dev, GFP_KERNEL, "%s.%d", dev_name(dev),
-                                   cs->bank);
-        if (!mtd->name)
-                return -ENOMEM;
-        mtd->dev.parent = dev;
-        chip->legacy.IO_ADDR_R = cs->base + OFFSET_DATA;
-        chip->legacy.IO_ADDR_W = cs->base + OFFSET_DATA;
-        chip->legacy.chip_delay = RB_DELAY_US;
-        chip->options = NAND_NO_SUBPAGE_WRITE;
-        chip->legacy.select_chip = jz4780_nand_select_chip;
-        chip->legacy.cmd_ctrl = jz4780_nand_cmd_ctrl;
-        chip->ecc.mode = NAND_ECC_HW;
-        chip->controller = &nfc->controller;
-        nand_set_flash_node(chip, np);
-        chip->controller->ops = &jz4780_nand_controller_ops;
-        ret = nand_scan(chip, 1);
-        if (ret)
-                return ret;
-        ret = mtd_device_register(mtd, NULL, 0);
-        if (ret) {
-                nand_release(chip);
-                return ret;
-        }
-        list_add_tail(&nand->chip_list, &nfc->chips);
-        return 0;
-}
-static void jz4780_nand_cleanup_chips(struct jz4780_nand_controller *nfc)
-{
-        struct jz4780_nand_chip *chip;
-        while (!list_empty(&nfc->chips)) {
-                chip = list_first_entry(&nfc->chips, struct jz4780_nand_chip, chip_list);
-                nand_release(&chip->chip);
-                list_del(&chip->chip_list);
-        }
-}
-static int jz4780_nand_init_chips(struct jz4780_nand_controller *nfc,
-                                  struct platform_device *pdev)
-{
-        struct device *dev = &pdev->dev;
-        struct device_node *np;
-        int i = 0;
-        int ret;
-        int num_chips = of_get_child_count(dev->of_node);
-        if (num_chips > nfc->num_banks) {
-                dev_err(dev, "found %d chips but only %d banks\n", num_chips, nfc->num_banks);
-                return -EINVAL;
-        }
-        for_each_child_of_node(dev->of_node, np) {
-                ret = jz4780_nand_init_chip(pdev, nfc, np, i);
-                if (ret) {
-                        jz4780_nand_cleanup_chips(nfc);
-                        return ret;
-                }
-                i++;
-        }
-        return 0;
-}
-static int jz4780_nand_probe(struct platform_device *pdev)
-{
-        struct device *dev = &pdev->dev;
-        unsigned int num_banks;
-        struct jz4780_nand_controller *nfc;
-        int ret;
-        num_banks = jz4780_nemc_num_banks(dev);
-        if (num_banks == 0) {
-                dev_err(dev, "no banks found\n");
-                return -ENODEV;
-        }
-        nfc = devm_kzalloc(dev, struct_size(nfc, cs, num_banks), GFP_KERNEL);
-        if (!nfc)
-                return -ENOMEM;
-        /*
-         * Check for BCH HW before we call nand_scan_ident, to prevent us from
-         * having to call it again if the BCH driver returns -EPROBE_DEFER.
-         */
-        nfc->bch = of_jz4780_bch_get(dev->of_node);
-        if (IS_ERR(nfc->bch))
-                return PTR_ERR(nfc->bch);
-        nfc->dev = dev;
-        nfc->num_banks = num_banks;
-        nand_controller_init(&nfc->controller);
-        INIT_LIST_HEAD(&nfc->chips);
-        ret = jz4780_nand_init_chips(nfc, pdev);
-        if (ret) {
-                if (nfc->bch)
-                        jz4780_bch_release(nfc->bch);
-                return ret;
-        }
-        platform_set_drvdata(pdev, nfc);
-        return 0;
-}
-static int jz4780_nand_remove(struct platform_device *pdev)
-{
-        struct jz4780_nand_controller *nfc = platform_get_drvdata(pdev);
-        if (nfc->bch)
-                jz4780_bch_release(nfc->bch);
-        jz4780_nand_cleanup_chips(nfc);
-        return 0;
-}
-static const struct of_device_id jz4780_nand_dt_match[] = {
-        { .compatible = "ingenic,jz4780-nand" },
-        {},
-};
-MODULE_DEVICE_TABLE(of, jz4780_nand_dt_match);
-static struct platform_driver jz4780_nand_driver = {
-        .probe          = jz4780_nand_probe,
-        .remove         = jz4780_nand_remove,
-        .driver = {
-                .name   = DRV_NAME,
-                .of_match_table = of_match_ptr(jz4780_nand_dt_match),
-        },
-};
-module_platform_driver(jz4780_nand_driver);
-MODULE_AUTHOR("Alex Smith <alex@alex-smith.me.uk>");
-MODULE_AUTHOR("Harvey Hunt <harveyhuntnexus@gmail.com>");
-MODULE_DESCRIPTION("Ingenic JZ4780 NAND driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
index d984538980e2..fc49e13d81ec 100644
--- a/drivers/mtd/nand/raw/marvell_nand.c
+++ b/drivers/mtd/nand/raw/marvell_nand.c
@@ -1083,12 +1083,11 @@ static int marvell_nfc_hw_ecc_hmg_read_page(struct nand_chip *chip, u8 *buf,
 */
 static int marvell_nfc_hw_ecc_hmg_read_oob_raw(struct nand_chip *chip, int page)
 {
-        /* Invalidate page cache */
+        u8 *buf = nand_get_data_buf(chip);
-        chip->pagebuf = -1;
        marvell_nfc_select_target(chip, chip->cur_cs);
-        return marvell_nfc_hw_ecc_hmg_do_read_page(chip, chip->data_buf,
+        return marvell_nfc_hw_ecc_hmg_do_read_page(chip, buf, chip->oob_poi,
-                                                   chip->oob_poi, true, page);
+                                                   true, page);
 }
 /* Hamming write helpers */
@@ -1179,15 +1178,13 @@ static int marvell_nfc_hw_ecc_hmg_write_oob_raw(struct nand_chip *chip,
                                                int page)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        u8 *buf = nand_get_data_buf(chip);
-        /* Invalidate page cache */
+        memset(buf, 0xFF, mtd->writesize);
-        chip->pagebuf = -1;
-        memset(chip->data_buf, 0xFF, mtd->writesize);
        marvell_nfc_select_target(chip, chip->cur_cs);
-        return marvell_nfc_hw_ecc_hmg_do_write_page(chip, chip->data_buf,
+        return marvell_nfc_hw_ecc_hmg_do_write_page(chip, buf, chip->oob_poi,
-                                                    chip->oob_poi, true, page);
+                                                    true, page);
 }
 /* BCH read helpers */
@@ -1434,18 +1431,16 @@ static int marvell_nfc_hw_ecc_bch_read_page(struct nand_chip *chip,
 static int marvell_nfc_hw_ecc_bch_read_oob_raw(struct nand_chip *chip, int page)
 {
-        /* Invalidate page cache */
+        u8 *buf = nand_get_data_buf(chip);
-        chip->pagebuf = -1;
-        return chip->ecc.read_page_raw(chip, chip->data_buf, true, page);
+        return chip->ecc.read_page_raw(chip, buf, true, page);
 }
 static int marvell_nfc_hw_ecc_bch_read_oob(struct nand_chip *chip, int page)
 {
-        /* Invalidate page cache */
+        u8 *buf = nand_get_data_buf(chip);
-        chip->pagebuf = -1;
-        return chip->ecc.read_page(chip, chip->data_buf, true, page);
+        return chip->ecc.read_page(chip, buf, true, page);
 }
 /* BCH write helpers */
@@ -1619,25 +1614,21 @@ static int marvell_nfc_hw_ecc_bch_write_oob_raw(struct nand_chip *chip,
                                                int page)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        u8 *buf = nand_get_data_buf(chip);
-        /* Invalidate page cache */
+        memset(buf, 0xFF, mtd->writesize);
-        chip->pagebuf = -1;
-        memset(chip->data_buf, 0xFF, mtd->writesize);
-        return chip->ecc.write_page_raw(chip, chip->data_buf, true, page);
+        return chip->ecc.write_page_raw(chip, buf, true, page);
 }
 static int marvell_nfc_hw_ecc_bch_write_oob(struct nand_chip *chip, int page)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        u8 *buf = nand_get_data_buf(chip);
-        /* Invalidate page cache */
+        memset(buf, 0xFF, mtd->writesize);
-        chip->pagebuf = -1;
-        memset(chip->data_buf, 0xFF, mtd->writesize);
-        return chip->ecc.write_page(chip, chip->data_buf, true, page);
+        return chip->ecc.write_page(chip, buf, true, page);
 }
 /* NAND framework ->exec_op() hooks and related helpers */
@@ -2257,9 +2248,9 @@ static int marvell_nand_ecc_init(struct mtd_info *mtd,
        int ret;
        if (ecc->mode != NAND_ECC_NONE && (!ecc->size || !ecc->strength)) {
-                if (chip->ecc_step_ds && chip->ecc_strength_ds) {
+                if (chip->base.eccreq.step_size && chip->base.eccreq.strength) {
-                        ecc->size = chip->ecc_step_ds;
+                        ecc->size = chip->base.eccreq.step_size;
-                        ecc->strength = chip->ecc_strength_ds;
+                        ecc->strength = chip->base.eccreq.strength;
                } else {
                        dev_info(nfc->dev,
                                 "No minimum ECC strength, using 1b/512B\n");
@@ -2989,7 +2980,7 @@ static int __maybe_unused marvell_nfc_resume(struct device *dev)
        /*
         * Reset nfc->selected_chip so the next command will cause the timing
-         * registers to be restored in marvell_nfc_select_chip().
+         * registers to be restored in marvell_nfc_select_target().
         */
        nfc->selected_chip = NULL;
diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index 3e8aa71407b5..ea57ddcec41e 100644
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -400,7 +400,7 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms)
        cfg |= NFC_RB_IRQ_EN;
        writel(cfg, nfc->reg_base + NFC_REG_CFG);
-        init_completion(&nfc->completion);
+        reinit_completion(&nfc->completion);
        /* use the max erase time as the maximum clock for waiting R/B */
        cmd = NFC_CMD_RB | NFC_CMD_RB_INT
@@ -470,15 +470,15 @@ static int meson_nfc_ecc_correct(struct nand_chip *nand, u32 *bitflips,
        return ret;
 }
-static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, u8 *databuf,
+static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf,
-                                      int datalen, u8 *infobuf, int infolen,
+                                      int datalen, void *infobuf, int infolen,
                                      enum dma_data_direction dir)
 {
        struct meson_nfc *nfc = nand_get_controller_data(nand);
        u32 cmd;
        int ret = 0;
-        nfc->daddr = dma_map_single(nfc->dev, (void *)databuf, datalen, dir);
+        nfc->daddr = dma_map_single(nfc->dev, databuf, datalen, dir);
        ret = dma_mapping_error(nfc->dev, nfc->daddr);
        if (ret) {
                dev_err(nfc->dev, "DMA mapping error\n");
@@ -528,10 +528,13 @@ static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len)
        u8 *info;
        info = kzalloc(PER_INFO_BYTE, GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
        ret = meson_nfc_dma_buffer_setup(nand, buf, len, info,
                                         PER_INFO_BYTE, DMA_FROM_DEVICE);
        if (ret)
-                return ret;
+                goto out;
        cmd = NFC_CMD_N2M | (len & GENMASK(5, 0));
        writel(cmd, nfc->reg_base + NFC_REG_CMD);
@@ -539,6 +542,8 @@ static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len)
        meson_nfc_drain_cmd(nfc);
        meson_nfc_wait_cmd_finish(nfc, 1000);
        meson_nfc_dma_buffer_release(nand, len, PER_INFO_BYTE, DMA_FROM_DEVICE);
+out:
        kfree(info);
        return ret;
@@ -640,7 +645,7 @@ static int meson_nfc_write_page_sub(struct nand_chip *nand,
                return ret;
        ret = meson_nfc_dma_buffer_setup(nand, meson_chip->data_buf,
-                                         data_len, (u8 *)meson_chip->info_buf,
+                                         data_len, meson_chip->info_buf,
                                         info_len, DMA_TO_DEVICE);
        if (ret)
                return ret;
@@ -724,7 +729,7 @@ static int meson_nfc_read_page_sub(struct nand_chip *nand,
                return ret;
        ret = meson_nfc_dma_buffer_setup(nand, meson_chip->data_buf,
-                                         data_len, (u8 *)meson_chip->info_buf,
+                                         data_len, meson_chip->info_buf,
                                         info_len, DMA_FROM_DEVICE);
        if (ret)
                return ret;
@@ -1183,6 +1188,8 @@ static int meson_nand_attach_chip(struct nand_chip *nand)
                return -EINVAL;
        }
+        mtd_set_ooblayout(mtd, &meson_ooblayout_ops);
        ret = meson_nand_bch_mode(nand);
        if (ret)
                return -EINVAL;
@@ -1226,17 +1233,13 @@ meson_nfc_nand_chip_init(struct device *dev,
        int ret, i;
        u32 tmp, nsels;
-        if (!of_get_property(np, "reg", &nsels))
+        nsels = of_property_count_elems_of_size(np, "reg", sizeof(u32));
-                return -EINVAL;
-        nsels /= sizeof(u32);
        if (!nsels || nsels > MAX_CE_NUM) {
                dev_err(dev, "invalid register property size\n");
                return -EINVAL;
        }
-        meson_chip = devm_kzalloc(dev,
+        meson_chip = devm_kzalloc(dev, struct_size(meson_chip, sels, nsels),
-                                  sizeof(*meson_chip) + (nsels * sizeof(u8)),
                                  GFP_KERNEL);
        if (!meson_chip)
                return -ENOMEM;
@@ -1377,6 +1380,7 @@ static int meson_nfc_probe(struct platform_device *pdev)
        nand_controller_init(&nfc->controller);
        INIT_LIST_HEAD(&nfc->chips);
+        init_completion(&nfc->completion);
        nfc->dev = dev;
diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c
index 2c0e09187773..b17619f30b1b 100644
--- a/drivers/mtd/nand/raw/mtk_nand.c
+++ b/drivers/mtd/nand/raw/mtk_nand.c
@@ -1197,8 +1197,8 @@ static int mtk_nfc_ecc_init(struct device *dev, struct mtd_info *mtd)
        /* if optional dt settings not present */
        if (!nand->ecc.size || !nand->ecc.strength) {
                /* use datasheet requirements */
-                nand->ecc.strength = nand->ecc_strength_ds;
+                nand->ecc.strength = nand->base.eccreq.strength;
-                nand->ecc.size = nand->ecc_step_ds;
+                nand->ecc.size = nand->base.eccreq.step_size;
                /*
                 * align eccstrength and eccsize
diff --git a/drivers/mtd/nand/raw/nand_amd.c b/drivers/mtd/nand/raw/nand_amd.c
index 890c5b43e03c..6217555c19a6 100644
--- a/drivers/mtd/nand/raw/nand_amd.c
+++ b/drivers/mtd/nand/raw/nand_amd.c
@@ -20,6 +20,9 @@
 static void amd_nand_decode_id(struct nand_chip *chip)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
+        memorg = nanddev_get_memorg(&chip->base);
        nand_decode_ext_id(chip);
@@ -31,16 +34,24 @@ static void amd_nand_decode_id(struct nand_chip *chip)
         */
        if (chip->id.data[4] != 0x00 && chip->id.data[5] == 0x00 &&
            chip->id.data[6] == 0x00 && chip->id.data[7] == 0x00 &&
-            mtd->writesize == 512) {
+            memorg->pagesize == 512) {
-                mtd->erasesize = 128 * 1024;
+                memorg->pages_per_eraseblock = 256;
-                mtd->erasesize <<= ((chip->id.data[3] & 0x03) << 1);
+                memorg->pages_per_eraseblock <<= ((chip->id.data[3] & 0x03) << 1);
+                mtd->erasesize = memorg->pages_per_eraseblock *
+                                 memorg->pagesize;
        }
 }
 static int amd_nand_init(struct nand_chip *chip)
 {
        if (nand_is_slc(chip))
-                chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;
+                /*
+                 * According to the datasheet of some Cypress SLC NANDs,
+                 * the bad block markers can be in the first, second or last
+                 * page of a block. So let's check all three locations.
+                 */
+                chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE |
+                                 NAND_BBM_LASTPAGE;
        return 0;
 }
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index ddd396e93e32..2cf71060d6f8 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -240,10 +240,10 @@ static int check_offs_len(struct nand_chip *chip, loff_t ofs, uint64_t len)
 void nand_select_target(struct nand_chip *chip, unsigned int cs)
 {
        /*
-         * cs should always lie between 0 and chip->numchips, when that's not
+         * cs should always lie between 0 and nanddev_ntargets(), when that's
-         * the case it's a bug and the caller should be fixed.
+         * not the case it's a bug and the caller should be fixed.
         */
-        if (WARN_ON(cs > chip->numchips))
+        if (WARN_ON(cs > nanddev_ntargets(&chip->base)))
                return;
        chip->cur_cs = cs;
@@ -283,6 +283,31 @@ static void nand_release_device(struct nand_chip *chip)
 }
 /**
+ * nand_bbm_get_next_page - Get the next page for bad block markers
+ * @chip: NAND chip object
+ * @page: First page to start checking for bad block marker usage
+ *
+ * Returns an integer that corresponds to the page offset within a block, for
+ * a page that is used to store bad block markers. If no more pages are
+ * available, -EINVAL is returned.
+ */
+int nand_bbm_get_next_page(struct nand_chip *chip, int page)
+{
+        struct mtd_info *mtd = nand_to_mtd(chip);
+        int last_page = ((mtd->erasesize - mtd->writesize) >>
+                         chip->page_shift) & chip->pagemask;
+        if (page == 0 && chip->options & NAND_BBM_FIRSTPAGE)
+                return 0;
+        else if (page <= 1 && chip->options & NAND_BBM_SECONDPAGE)
+                return 1;
+        else if (page <= last_page && chip->options & NAND_BBM_LASTPAGE)
+                return last_page;
+        return -EINVAL;
+}
+/**
 * nand_block_bad - [DEFAULT] Read bad block marker from the chip
 * @chip: NAND chip object
 * @ofs: offset from device start
@@ -291,18 +316,15 @@ static void nand_release_device(struct nand_chip *chip)
 */
 static int nand_block_bad(struct nand_chip *chip, loff_t ofs)
 {
-        struct mtd_info *mtd = nand_to_mtd(chip);
+        int first_page, page_offset;
-        int page, page_end, res;
+        int res;
        u8 bad;
-        if (chip->bbt_options & NAND_BBT_SCANLASTPAGE)
+        first_page = (int)(ofs >> chip->page_shift) & chip->pagemask;
-                ofs += mtd->erasesize - mtd->writesize;
+        page_offset = nand_bbm_get_next_page(chip, 0);
-        page = (int)(ofs >> chip->page_shift) & chip->pagemask;
-        page_end = page + (chip->bbt_options & NAND_BBT_SCAN2NDPAGE ? 2 : 1);
-        for (; page < page_end; page++) {
+        while (page_offset >= 0) {
-                res = chip->ecc.read_oob(chip, page);
+                res = chip->ecc.read_oob(chip, first_page + page_offset);
                if (res < 0)
                        return res;
@@ -314,6 +336,8 @@ static int nand_block_bad(struct nand_chip *chip, loff_t ofs)
                        res = hweight8(bad) < chip->badblockbits;
                if (res)
                        return res;
+                page_offset = nand_bbm_get_next_page(chip, page_offset + 1);
        }
        return 0;
@@ -459,8 +483,8 @@ static int nand_do_write_oob(struct nand_chip *chip, loff_t to,
        }
        /* Invalidate the page cache, if we write to the cached page */
-        if (page == chip->pagebuf)
+        if (page == chip->pagecache.page)
-                chip->pagebuf = -1;
+                chip->pagecache.page = -1;
        nand_fill_oob(chip, ops->oobbuf, ops->ooblen, ops);
@@ -493,7 +517,7 @@ static int nand_default_block_markbad(struct nand_chip *chip, loff_t ofs)
        struct mtd_info *mtd = nand_to_mtd(chip);
        struct mtd_oob_ops ops;
        uint8_t buf[2] = { 0, 0 };
-        int ret = 0, res, i = 0;
+        int ret = 0, res, page_offset;
        memset(&ops, 0, sizeof(ops));
        ops.oobbuf = buf;
@@ -506,17 +530,18 @@ static int nand_default_block_markbad(struct nand_chip *chip, loff_t ofs)
        }
        ops.mode = MTD_OPS_PLACE_OOB;
-        /* Write to first/last page(s) if necessary */
+        page_offset = nand_bbm_get_next_page(chip, 0);
-        if (chip->bbt_options & NAND_BBT_SCANLASTPAGE)
-                ofs += mtd->erasesize - mtd->writesize;
+        while (page_offset >= 0) {
-        do {
+                res = nand_do_write_oob(chip,
-                res = nand_do_write_oob(chip, ofs, &ops);
+                                        ofs + (page_offset * mtd->writesize),
+                                        &ops);
                if (!ret)
                        ret = res;
-                i++;
+                page_offset = nand_bbm_get_next_page(chip, page_offset + 1);
-                ofs += mtd->writesize;
+        }
-        } while ((chip->bbt_options & NAND_BBT_SCAN2NDPAGE) && i < 2);
        return ret;
 }
@@ -3173,7 +3198,7 @@ static int nand_do_read_ops(struct nand_chip *chip, loff_t from,
                        use_bufpoi = 0;
                /* Is the current page in the buffer? */
-                if (realpage != chip->pagebuf || oob) {
+                if (realpage != chip->pagecache.page || oob) {
                        bufpoi = use_bufpoi ? chip->data_buf : buf;
                        if (use_bufpoi && aligned)
@@ -3199,7 +3224,7 @@ read_retry:
                        if (ret < 0) {
                                if (use_bufpoi)
                                        /* Invalidate page cache */
-                                        chip->pagebuf = -1;
+                                        chip->pagecache.page = -1;
                                break;
                        }
@@ -3208,11 +3233,11 @@ read_retry:
                                if (!NAND_HAS_SUBPAGE_READ(chip) && !oob &&
                                    !(mtd->ecc_stats.failed - ecc_failures) &&
                                    (ops->mode != MTD_OPS_RAW)) {
-                                        chip->pagebuf = realpage;
+                                        chip->pagecache.page = realpage;
-                                        chip->pagebuf_bitflips = ret;
+                                        chip->pagecache.bitflips = ret;
                                } else {
                                        /* Invalidate page cache */
-                                        chip->pagebuf = -1;
+                                        chip->pagecache.page = -1;
                                }
                                memcpy(buf, chip->data_buf + col, bytes);
                        }
@@ -3252,7 +3277,7 @@ read_retry:
                        memcpy(buf, chip->data_buf + col, bytes);
                        buf += bytes;
                        max_bitflips = max_t(unsigned int, max_bitflips,
-                                             chip->pagebuf_bitflips);
+                                             chip->pagecache.bitflips);
                }
                readlen -= bytes;
@@ -3973,9 +3998,9 @@ static int nand_do_write_ops(struct nand_chip *chip, loff_t to,
        page = realpage & chip->pagemask;
        /* Invalidate the page cache, when we write to the cached page */
-        if (to <= ((loff_t)chip->pagebuf << chip->page_shift) &&
+        if (to <= ((loff_t)chip->pagecache.page << chip->page_shift) &&
-            ((loff_t)chip->pagebuf << chip->page_shift) < (to + ops->len))
+            ((loff_t)chip->pagecache.page << chip->page_shift) < (to + ops->len))
-                chip->pagebuf = -1;
+                chip->pagecache.page = -1;
        /* Don't allow multipage oob writes with offset */
        if (oob && ops->ooboffs && (ops->ooboffs + ops->ooblen > oobmaxlen)) {
@@ -4004,10 +4029,9 @@ static int nand_do_write_ops(struct nand_chip *chip, loff_t to,
                                         __func__, buf);
                        if (part_pagewr)
                                bytes = min_t(int, bytes - column, writelen);
-                        chip->pagebuf = -1;
+                        wbuf = nand_get_data_buf(chip);
-                        memset(chip->data_buf, 0xff, mtd->writesize);
+                        memset(wbuf, 0xff, mtd->writesize);
-                        memcpy(&chip->data_buf[column], buf, bytes);
+                        memcpy(&wbuf[column], buf, bytes);
-                        wbuf = chip->data_buf;
                }
                if (unlikely(oob)) {
@@ -4197,9 +4221,9 @@ int nand_erase_nand(struct nand_chip *chip, struct erase_info *instr,
                 * Invalidate the page cache, if we erase the block which
                 * contains the current cached page.
                 */
-                if (page <= chip->pagebuf && chip->pagebuf <
+                if (page <= chip->pagecache.page && chip->pagecache.page <
                    (page + pages_per_block))
-                        chip->pagebuf = -1;
+                        chip->pagecache.page = -1;
                ret = nand_erase_op(chip, (page & chip->pagemask) >>
                                    (chip->phys_erase_shift - chip->page_shift));
@@ -4299,42 +4323,6 @@ static int nand_block_markbad(struct mtd_info *mtd, loff_t ofs)
 }
 /**
- * nand_max_bad_blocks - [MTD Interface] Max number of bad blocks for an mtd
- * @mtd: MTD device structure
- * @ofs: offset relative to mtd start
- * @len: length of mtd
- */
-static int nand_max_bad_blocks(struct mtd_info *mtd, loff_t ofs, size_t len)
-{
-        struct nand_chip *chip = mtd_to_nand(mtd);
-        u32 part_start_block;
-        u32 part_end_block;
-        u32 part_start_die;
-        u32 part_end_die;
-        /*
-         * max_bb_per_die and blocks_per_die used to determine
-         * the maximum bad block count.
-         */
-        if (!chip->max_bb_per_die || !chip->blocks_per_die)
-                return -ENOTSUPP;
-        /* Get the start and end of the partition in erase blocks. */
-        part_start_block = mtd_div_by_eb(ofs, mtd);
-        part_end_block = mtd_div_by_eb(len, mtd) + part_start_block - 1;
-        /* Get the start and end LUNs of the partition. */
-        part_start_die = part_start_block / chip->blocks_per_die;
-        part_end_die = part_end_block / chip->blocks_per_die;
-        /*
-         * Look up the bad blocks per unit and multiply by the number of units
-         * that the partition spans.
-         */
-        return chip->max_bb_per_die * (part_end_die - part_start_die + 1);
-}
-/**
 * nand_suspend - [MTD Interface] Suspend the NAND flash
 * @mtd: MTD device structure
 */
@@ -4485,21 +4473,29 @@ static int nand_get_bits_per_cell(u8 cellinfo)
 */
 void nand_decode_ext_id(struct nand_chip *chip)
 {
+        struct nand_memory_organization *memorg;
        struct mtd_info *mtd = nand_to_mtd(chip);
        int extid;
        u8 *id_data = chip->id.data;
+        memorg = nanddev_get_memorg(&chip->base);
        /* The 3rd id byte holds MLC / multichip data */
-        chip->bits_per_cell = nand_get_bits_per_cell(id_data[2]);
+        memorg->bits_per_cell = nand_get_bits_per_cell(id_data[2]);
        /* The 4th id byte is the important one */
        extid = id_data[3];
        /* Calc pagesize */
-        mtd->writesize = 1024 << (extid & 0x03);
+        memorg->pagesize = 1024 << (extid & 0x03);
+        mtd->writesize = memorg->pagesize;
        extid >>= 2;
        /* Calc oobsize */
-        mtd->oobsize = (8 << (extid & 0x01)) * (mtd->writesize >> 9);
+        memorg->oobsize = (8 << (extid & 0x01)) * (mtd->writesize >> 9);
+        mtd->oobsize = memorg->oobsize;
        extid >>= 2;
        /* Calc blocksize. Blocksize is multiples of 64KiB */
+        memorg->pages_per_eraseblock = ((64 * 1024) << (extid & 0x03)) /
+                                       memorg->pagesize;
        mtd->erasesize = (64 * 1024) << (extid & 0x03);
        extid >>= 2;
        /* Get buswidth information */
@@ -4516,13 +4512,19 @@ EXPORT_SYMBOL_GPL(nand_decode_ext_id);
 static void nand_decode_id(struct nand_chip *chip, struct nand_flash_dev *type)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
+        memorg = nanddev_get_memorg(&chip->base);
+        memorg->pages_per_eraseblock = type->erasesize / type->pagesize;
        mtd->erasesize = type->erasesize;
-        mtd->writesize = type->pagesize;
+        memorg->pagesize = type->pagesize;
-        mtd->oobsize = mtd->writesize / 32;
+        mtd->writesize = memorg->pagesize;
+        memorg->oobsize = memorg->pagesize / 32;
+        mtd->oobsize = memorg->oobsize;
        /* All legacy ID NAND are small-page, SLC */
-        chip->bits_per_cell = 1;
+        memorg->bits_per_cell = 1;
 }
 /*
@@ -4536,9 +4538,9 @@ static void nand_decode_bbm_options(struct nand_chip *chip)
        /* Set the bad block position */
        if (mtd->writesize > 512 || (chip->options & NAND_BUSWIDTH_16))
-                chip->badblockpos = NAND_LARGE_BADBLOCK_POS;
+                chip->badblockpos = NAND_BBM_POS_LARGE;
        else
-                chip->badblockpos = NAND_SMALL_BADBLOCK_POS;
+                chip->badblockpos = NAND_BBM_POS_SMALL;
 }
 static inline bool is_full_id_nand(struct nand_flash_dev *type)
@@ -4550,18 +4552,28 @@ static bool find_full_id_nand(struct nand_chip *chip,
                              struct nand_flash_dev *type)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
        u8 *id_data = chip->id.data;
+        memorg = nanddev_get_memorg(&chip->base);
        if (!strncmp(type->id, id_data, type->id_len)) {
-                mtd->writesize = type->pagesize;
+                memorg->pagesize = type->pagesize;
+                mtd->writesize = memorg->pagesize;
+                memorg->pages_per_eraseblock = type->erasesize /
+                                               type->pagesize;
                mtd->erasesize = type->erasesize;
-                mtd->oobsize = type->oobsize;
+                memorg->oobsize = type->oobsize;
+                mtd->oobsize = memorg->oobsize;
-                chip->bits_per_cell = nand_get_bits_per_cell(id_data[2]);
-                chip->chipsize = (uint64_t)type->chipsize << 20;
+                memorg->bits_per_cell = nand_get_bits_per_cell(id_data[2]);
+                memorg->eraseblocks_per_lun =
+                        DIV_ROUND_DOWN_ULL((u64)type->chipsize << 20,
+                                           memorg->pagesize *
+                                           memorg->pages_per_eraseblock);
                chip->options |= type->options;
-                chip->ecc_strength_ds = NAND_ECC_STRENGTH(type);
+                chip->base.eccreq.strength = NAND_ECC_STRENGTH(type);
-                chip->ecc_step_ds = NAND_ECC_STEP(type);
+                chip->base.eccreq.step_size = NAND_ECC_STEP(type);
                chip->onfi_timing_mode_default =
                                        type->onfi_timing_mode_default;
@@ -4587,8 +4599,12 @@ static void nand_manufacturer_detect(struct nand_chip *chip)
         */
        if (chip->manufacturer.desc && chip->manufacturer.desc->ops &&
            chip->manufacturer.desc->ops->detect) {
+                struct nand_memory_organization *memorg;
+                memorg = nanddev_get_memorg(&chip->base);
                /* The 3rd id byte holds MLC / multichip data */
-                chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]);
+                memorg->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]);
                chip->manufacturer.desc->ops->detect(chip);
        } else {
                nand_decode_ext_id(chip);
@@ -4637,9 +4653,20 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type)
 {
        const struct nand_manufacturer *manufacturer;
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
        int busw, ret;
        u8 *id_data = chip->id.data;
        u8 maf_id, dev_id;
+        u64 targetsize;
+        /*
+         * Let's start by initializing memorg fields that might be left
+         * unassigned by the ID-based detection logic.
+         */
+        memorg = nanddev_get_memorg(&chip->base);
+        memorg->planes_per_lun = 1;
+        memorg->luns_per_target = 1;
+        memorg->ntargets = 1;
        /*
         * Reset the chip, required by some chips (e.g. Micron MT29FxGxxxxx)
@@ -4735,8 +4762,6 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type)
        if (!chip->parameters.model)
                return -ENOMEM;
-        chip->chipsize = (uint64_t)type->chipsize << 20;
        if (!type->pagesize)
                nand_manufacturer_detect(chip);
        else
@@ -4745,6 +4770,11 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type)
        /* Get chip options */
        chip->options |= type->options;
+        memorg->eraseblocks_per_lun =
+                        DIV_ROUND_DOWN_ULL((u64)type->chipsize << 20,
+                                           memorg->pagesize *
+                                           memorg->pages_per_eraseblock);
 ident_done:
        if (!mtd->name)
                mtd->name = chip->parameters.model;
@@ -4773,14 +4803,15 @@ ident_done:
        /* Calculate the address shift from the page size */
        chip->page_shift = ffs(mtd->writesize) - 1;
        /* Convert chipsize to number of pages per chip -1 */
-        chip->pagemask = (chip->chipsize >> chip->page_shift) - 1;
+        targetsize = nanddev_target_size(&chip->base);
+        chip->pagemask = (targetsize >> chip->page_shift) - 1;
        chip->bbt_erase_shift = chip->phys_erase_shift =
                ffs(mtd->erasesize) - 1;
-        if (chip->chipsize & 0xffffffff)
+        if (targetsize & 0xffffffff)
-                chip->chip_shift = ffs((unsigned)chip->chipsize) - 1;
+                chip->chip_shift = ffs((unsigned)targetsize) - 1;
        else {
-                chip->chip_shift = ffs((unsigned)(chip->chipsize >> 32));
+                chip->chip_shift = ffs((unsigned)(targetsize >> 32));
                chip->chip_shift += 32 - 1;
        }
@@ -4796,7 +4827,7 @@ ident_done:
        pr_info("%s %s\n", nand_manufacturer_name(manufacturer),
                chip->parameters.model);
        pr_info("%d MiB, %s, erase size: %d KiB, page size: %d, OOB size: %d\n",
-                (int)(chip->chipsize >> 20), nand_is_slc(chip) ? "SLC" : "MLC",
+                (int)(targetsize >> 20), nand_is_slc(chip) ? "SLC" : "MLC",
                mtd->erasesize >> 10, mtd->writesize, mtd->oobsize);
        return 0;
@@ -4971,10 +5002,13 @@ static int nand_scan_ident(struct nand_chip *chip, unsigned int maxchips,
                           struct nand_flash_dev *table)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
        int nand_maf_id, nand_dev_id;
        unsigned int i;
        int ret;
+        memorg = nanddev_get_memorg(&chip->base);
        /* Assume all dies are deselected when we enter nand_scan_ident(). */
        chip->cur_cs = -1;
@@ -4990,12 +5024,6 @@ static int nand_scan_ident(struct nand_chip *chip, unsigned int maxchips,
        if (!mtd->name && mtd->dev.parent)
                mtd->name = dev_name(mtd->dev.parent);
-        /*
-         * Start with chips->numchips = maxchips to let nand_select_target() do
-         * its job. chip->numchips will be adjusted after.
-         */
-        chip->numchips = maxchips;
        /* Set the default functions */
        nand_set_defaults(chip);
@@ -5042,8 +5070,8 @@ static int nand_scan_ident(struct nand_chip *chip, unsigned int maxchips,
                pr_info("%d chips detected\n", i);
        /* Store the number of chips and calc total size for mtd */
-        chip->numchips = i;
+        memorg->ntargets = i;
-        mtd->size = i * chip->chipsize;
+        mtd->size = i * nanddev_target_size(&chip->base);
        return 0;
 }
@@ -5078,13 +5106,13 @@ static int nand_set_ecc_soft_ops(struct nand_chip *chip)
                ecc->bytes = 3;
                ecc->strength = 1;
-                if (IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC))
+                if (IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC))
                        ecc->options |= NAND_ECC_SOFT_HAMMING_SM_ORDER;
                return 0;
        case NAND_ECC_BCH:
                if (!mtd_nand_has_bch()) {
-                        WARN(1, "CONFIG_MTD_NAND_ECC_BCH not enabled\n");
+                        WARN(1, "CONFIG_MTD_NAND_ECC_SW_BCH not enabled\n");
                        return -EINVAL;
                }
                ecc->calculate = nand_bch_calculate_ecc;
@@ -5224,8 +5252,8 @@ nand_match_ecc_req(struct nand_chip *chip,
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
        const struct nand_ecc_step_info *stepinfo;
-        int req_step = chip->ecc_step_ds;
+        int req_step = chip->base.eccreq.step_size;
-        int req_strength = chip->ecc_strength_ds;
+        int req_strength = chip->base.eccreq.strength;
        int req_corr, step_size, strength, nsteps, ecc_bytes, ecc_bytes_total;
        int best_step, best_strength, best_ecc_bytes;
        int best_ecc_bytes_total = INT_MAX;
@@ -5418,7 +5446,7 @@ static bool nand_ecc_strength_good(struct nand_chip *chip)
        struct nand_ecc_ctrl *ecc = &chip->ecc;
        int corr, ds_corr;
-        if (ecc->size == 0 || chip->ecc_step_ds == 0)
+        if (ecc->size == 0 || chip->base.eccreq.step_size == 0)
                /* Not enough information */
                return true;
@@ -5427,11 +5455,56 @@ static bool nand_ecc_strength_good(struct nand_chip *chip)
         * the correction density.
         */
        corr = (mtd->writesize * ecc->strength) / ecc->size;
-        ds_corr = (mtd->writesize * chip->ecc_strength_ds) / chip->ecc_step_ds;
+        ds_corr = (mtd->writesize * chip->base.eccreq.strength) /
+                  chip->base.eccreq.step_size;
-        return corr >= ds_corr && ecc->strength >= chip->ecc_strength_ds;
+        return corr >= ds_corr && ecc->strength >= chip->base.eccreq.strength;
 }
+static int rawnand_erase(struct nand_device *nand, const struct nand_pos *pos)
+{
+        struct nand_chip *chip = container_of(nand, struct nand_chip,
+                                              base);
+        unsigned int eb = nanddev_pos_to_row(nand, pos);
+        int ret;
+        eb >>= nand->rowconv.eraseblock_addr_shift;
+        nand_select_target(chip, pos->target);
+        ret = nand_erase_op(chip, eb);
+        nand_deselect_target(chip);
+        return ret;
+}
+static int rawnand_markbad(struct nand_device *nand,
+                           const struct nand_pos *pos)
+{
+        struct nand_chip *chip = container_of(nand, struct nand_chip,
+                                              base);
+        return nand_markbad_bbm(chip, nanddev_pos_to_offs(nand, pos));
+}
+static bool rawnand_isbad(struct nand_device *nand, const struct nand_pos *pos)
+{
+        struct nand_chip *chip = container_of(nand, struct nand_chip,
+                                              base);
+        int ret;
+        nand_select_target(chip, pos->target);
+        ret = nand_isbad_bbm(chip, nanddev_pos_to_offs(nand, pos));
+        nand_deselect_target(chip);
+        return ret;
+}
+static const struct nand_ops rawnand_ops = {
+        .erase = rawnand_erase,
+        .markbad = rawnand_markbad,
+        .isbad = rawnand_isbad,
+};
 /**
 * nand_scan_tail - Scan for the NAND device
 * @chip: NAND chip object
@@ -5687,7 +5760,7 @@ static int nand_scan_tail(struct nand_chip *chip)
        chip->subpagesize = mtd->writesize >> mtd->subpage_sft;
        /* Invalidate the pagebuffer reference */
-        chip->pagebuf = -1;
+        chip->pagecache.page = -1;
        /* Large page NAND with SOFT_ECC should support subpage reads */
        switch (ecc->mode) {
@@ -5700,10 +5773,15 @@ static int nand_scan_tail(struct nand_chip *chip)
                break;
        }
+        ret = nanddev_init(&chip->base, &rawnand_ops, mtd->owner);
+        if (ret)
+                goto err_nand_manuf_cleanup;
+        /* Adjust the MTD_CAP_ flags when NAND_ROM is set. */
+        if (chip->options & NAND_ROM)
+                mtd->flags = MTD_CAP_ROM;
        /* Fill in remaining MTD driver data */
-        mtd->type = nand_is_slc(chip) ? MTD_NANDFLASH : MTD_MLCNANDFLASH;
-        mtd->flags = (chip->options & NAND_ROM) ? MTD_CAP_ROM :
-                                                MTD_CAP_NANDFLASH;
        mtd->_erase = nand_erase;
        mtd->_point = NULL;
        mtd->_unpoint = NULL;
@@ -5719,8 +5797,7 @@ static int nand_scan_tail(struct nand_chip *chip)
        mtd->_block_isreserved = nand_block_isreserved;
        mtd->_block_isbad = nand_block_isbad;
        mtd->_block_markbad = nand_block_markbad;
-        mtd->_max_bad_blocks = nand_max_bad_blocks;
+        mtd->_max_bad_blocks = nanddev_mtd_max_bad_blocks;
-        mtd->writebufsize = mtd->writesize;
        /*
         * Initialize bitflip_threshold to its default prior scan_bbt() call.
@@ -5733,13 +5810,13 @@ static int nand_scan_tail(struct nand_chip *chip)
        /* Initialize the ->data_interface field. */
        ret = nand_init_data_interface(chip);
        if (ret)
-                goto err_nand_manuf_cleanup;
+                goto err_nanddev_cleanup;
        /* Enter fastest possible mode on all dies. */
-        for (i = 0; i < chip->numchips; i++) {
+        for (i = 0; i < nanddev_ntargets(&chip->base); i++) {
                ret = nand_setup_data_interface(chip, i);
                if (ret)
-                        goto err_nand_manuf_cleanup;
+                        goto err_nanddev_cleanup;
        }
        /* Check, if we should skip the bad block table scan */
@@ -5749,11 +5826,14 @@ static int nand_scan_tail(struct nand_chip *chip)
        /* Build bad block table */
        ret = nand_create_bbt(chip);
        if (ret)
-                goto err_nand_manuf_cleanup;
+                goto err_nanddev_cleanup;
        return 0;
+err_nanddev_cleanup:
+        nanddev_cleanup(&chip->base);
 err_nand_manuf_cleanup:
        nand_manufacturer_cleanup(chip);
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 19a2b563acdf..fd3c10216eda 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -264,18 +264,19 @@ static int read_abs_bbt(struct nand_chip *this, uint8_t *buf,
                        struct nand_bbt_descr *td, int chip)
 {
        struct mtd_info *mtd = nand_to_mtd(this);
+        u64 targetsize = nanddev_target_size(&this->base);
        int res = 0, i;
        if (td->options & NAND_BBT_PERCHIP) {
                int offs = 0;
-                for (i = 0; i < this->numchips; i++) {
+                for (i = 0; i < nanddev_ntargets(&this->base); i++) {
                        if (chip == -1 || chip == i)
                                res = read_bbt(this, buf, td->pages[i],
-                                        this->chipsize >> this->bbt_erase_shift,
+                                        targetsize >> this->bbt_erase_shift,
                                        td, offs);
                        if (res)
                                return res;
-                        offs += this->chipsize >> this->bbt_erase_shift;
+                        offs += targetsize >> this->bbt_erase_shift;
                }
        } else {
                res = read_bbt(this, buf, td->pages[0],
@@ -415,11 +416,12 @@ static void read_abs_bbts(struct nand_chip *this, uint8_t *buf,
 /* Scan a given block partially */
 static int scan_block_fast(struct nand_chip *this, struct nand_bbt_descr *bd,
-                           loff_t offs, uint8_t *buf, int numpages)
+                           loff_t offs, uint8_t *buf)
 {
        struct mtd_info *mtd = nand_to_mtd(this);
        struct mtd_oob_ops ops;
-        int j, ret;
+        int ret, page_offset;
        ops.ooblen = mtd->oobsize;
        ops.oobbuf = buf;
@@ -427,12 +429,15 @@ static int scan_block_fast(struct nand_chip *this, struct nand_bbt_descr *bd,
        ops.datbuf = NULL;
        ops.mode = MTD_OPS_PLACE_OOB;
-        for (j = 0; j < numpages; j++) {
+        page_offset = nand_bbm_get_next_page(this, 0);
+        while (page_offset >= 0) {
                /*
                 * Read the full oob until read_oob is fixed to handle single
                 * byte reads for 16 bit buswidth.
                 */
-                ret = mtd_read_oob(mtd, offs, &ops);
+                ret = mtd_read_oob(mtd, offs + (page_offset * mtd->writesize),
+                                   &ops);
                /* Ignore ECC errors when checking for BBM */
                if (ret && !mtd_is_bitflip_or_eccerr(ret))
                        return ret;
@@ -440,8 +445,9 @@ static int scan_block_fast(struct nand_chip *this, struct nand_bbt_descr *bd,
                if (check_short_pattern(buf, bd))
                        return 1;
-                offs += mtd->writesize;
+                page_offset = nand_bbm_get_next_page(this, page_offset + 1);
        }
        return 0;
 }
@@ -459,43 +465,35 @@ static int scan_block_fast(struct nand_chip *this, struct nand_bbt_descr *bd,
 static int create_bbt(struct nand_chip *this, uint8_t *buf,
                      struct nand_bbt_descr *bd, int chip)
 {
+        u64 targetsize = nanddev_target_size(&this->base);
        struct mtd_info *mtd = nand_to_mtd(this);
-        int i, numblocks, numpages;
+        int i, numblocks, startblock;
-        int startblock;
        loff_t from;
        pr_info("Scanning device for bad blocks\n");
-        if (bd->options & NAND_BBT_SCAN2NDPAGE)
-                numpages = 2;
-        else
-                numpages = 1;
        if (chip == -1) {
                numblocks = mtd->size >> this->bbt_erase_shift;
                startblock = 0;
                from = 0;
        } else {
-                if (chip >= this->numchips) {
+                if (chip >= nanddev_ntargets(&this->base)) {
                        pr_warn("create_bbt(): chipnr (%d) > available chips (%d)\n",
-                               chip + 1, this->numchips);
+                                chip + 1, nanddev_ntargets(&this->base));
                        return -EINVAL;
                }
-                numblocks = this->chipsize >> this->bbt_erase_shift;
+                numblocks = targetsize >> this->bbt_erase_shift;
                startblock = chip * numblocks;
                numblocks += startblock;
                from = (loff_t)startblock << this->bbt_erase_shift;
        }
-        if (this->bbt_options & NAND_BBT_SCANLASTPAGE)
-                from += mtd->erasesize - (mtd->writesize * numpages);
        for (i = startblock; i < numblocks; i++) {
                int ret;
                BUG_ON(bd->options & NAND_BBT_NO_OOB);
-                ret = scan_block_fast(this, bd, from, buf, numpages);
+                ret = scan_block_fast(this, bd, from, buf);
                if (ret < 0)
                        return ret;
@@ -529,6 +527,7 @@ static int create_bbt(struct nand_chip *this, uint8_t *buf,
 static int search_bbt(struct nand_chip *this, uint8_t *buf,
                      struct nand_bbt_descr *td)
 {
+        u64 targetsize = nanddev_target_size(&this->base);
        struct mtd_info *mtd = nand_to_mtd(this);
        int i, chips;
        int startblock, block, dir;
@@ -547,8 +546,8 @@ static int search_bbt(struct nand_chip *this, uint8_t *buf,
        /* Do we have a bbt per chip? */
        if (td->options & NAND_BBT_PERCHIP) {
-                chips = this->numchips;
+                chips = nanddev_ntargets(&this->base);
-                bbtblocks = this->chipsize >> this->bbt_erase_shift;
+                bbtblocks = targetsize >> this->bbt_erase_shift;
                startblock &= bbtblocks - 1;
        } else {
                chips = 1;
@@ -576,7 +575,7 @@ static int search_bbt(struct nand_chip *this, uint8_t *buf,
                                break;
                        }
                }
-                startblock += this->chipsize >> this->bbt_erase_shift;
+                startblock += targetsize >> this->bbt_erase_shift;
        }
        /* Check, if we found a bbt for each requested chip */
        for (i = 0; i < chips; i++) {
@@ -626,6 +625,7 @@ static void search_read_bbts(struct nand_chip *this, uint8_t *buf,
 static int get_bbt_block(struct nand_chip *this, struct nand_bbt_descr *td,
                         struct nand_bbt_descr *md, int chip)
 {
+        u64 targetsize = nanddev_target_size(&this->base);
        int startblock, dir, page, numblocks, i;
        /*
@@ -637,9 +637,9 @@ static int get_bbt_block(struct nand_chip *this, struct nand_bbt_descr *td,
                return td->pages[chip] >>
                                (this->bbt_erase_shift - this->page_shift);
-        numblocks = (int)(this->chipsize >> this->bbt_erase_shift);
+        numblocks = (int)(targetsize >> this->bbt_erase_shift);
        if (!(td->options & NAND_BBT_PERCHIP))
-                numblocks *= this->numchips;
+                numblocks *= nanddev_ntargets(&this->base);
        /*
         * Automatic placement of the bad block table. Search direction
@@ -717,6 +717,7 @@ static int write_bbt(struct nand_chip *this, uint8_t *buf,
                     struct nand_bbt_descr *td, struct nand_bbt_descr *md,
                     int chipsel)
 {
+        u64 targetsize = nanddev_target_size(&this->base);
        struct mtd_info *mtd = nand_to_mtd(this);
        struct erase_info einfo;
        int i, res, chip = 0;
@@ -737,10 +738,10 @@ static int write_bbt(struct nand_chip *this, uint8_t *buf,
                rcode = 0xff;
        /* Write bad block table per chip rather than per device? */
        if (td->options & NAND_BBT_PERCHIP) {
-                numblocks = (int)(this->chipsize >> this->bbt_erase_shift);
+                numblocks = (int)(targetsize >> this->bbt_erase_shift);
                /* Full device write or specific chip? */
                if (chipsel == -1) {
-                        nrchips = this->numchips;
+                        nrchips = nanddev_ntargets(&this->base);
                } else {
                        nrchips = chipsel + 1;
                        chip = chipsel;
@@ -901,7 +902,9 @@ static int write_bbt(struct nand_chip *this, uint8_t *buf,
 static inline int nand_memory_bbt(struct nand_chip *this,
                                  struct nand_bbt_descr *bd)
 {
-        return create_bbt(this, this->data_buf, bd, -1);
+        u8 *pagebuf = nand_get_data_buf(this);
+        return create_bbt(this, pagebuf, bd, -1);
 }
 /**
@@ -925,7 +928,7 @@ static int check_create(struct nand_chip *this, uint8_t *buf,
        /* Do we have a bbt per chip? */
        if (td->options & NAND_BBT_PERCHIP)
-                chips = this->numchips;
+                chips = nanddev_ntargets(&this->base);
        else
                chips = 1;
@@ -1097,14 +1100,15 @@ static int nand_update_bbt(struct nand_chip *this, loff_t offs)
 */
 static void mark_bbt_region(struct nand_chip *this, struct nand_bbt_descr *td)
 {
+        u64 targetsize = nanddev_target_size(&this->base);
        struct mtd_info *mtd = nand_to_mtd(this);
        int i, j, chips, block, nrblocks, update;
        uint8_t oldval;
        /* Do we have a bbt per chip? */
        if (td->options & NAND_BBT_PERCHIP) {
-                chips = this->numchips;
+                chips = nanddev_ntargets(&this->base);
-                nrblocks = (int)(this->chipsize >> this->bbt_erase_shift);
+                nrblocks = (int)(targetsize >> this->bbt_erase_shift);
        } else {
                chips = 1;
                nrblocks = (int)(mtd->size >> this->bbt_erase_shift);
@@ -1157,6 +1161,7 @@ static void mark_bbt_region(struct nand_chip *this, struct nand_bbt_descr *td)
 */
 static void verify_bbt_descr(struct nand_chip *this, struct nand_bbt_descr *bd)
 {
+        u64 targetsize = nanddev_target_size(&this->base);
        struct mtd_info *mtd = nand_to_mtd(this);
        u32 pattern_len;
        u32 bits;
@@ -1185,7 +1190,7 @@ static void verify_bbt_descr(struct nand_chip *this, struct nand_bbt_descr *bd)
        }
        if (bd->options & NAND_BBT_PERCHIP)
-                table_size = this->chipsize >> this->bbt_erase_shift;
+                table_size = targetsize >> this->bbt_erase_shift;
        else
                table_size = mtd->size >> this->bbt_erase_shift;
        table_size >>= 3;
diff --git a/drivers/mtd/nand/raw/nand_esmt.c b/drivers/mtd/nand/raw/nand_esmt.c
index 96f039a83bc8..3338c68aaaf1 100644
--- a/drivers/mtd/nand/raw/nand_esmt.c
+++ b/drivers/mtd/nand/raw/nand_esmt.c
@@ -14,20 +14,20 @@ static void esmt_nand_decode_id(struct nand_chip *chip)
        /* Extract ECC requirements from 5th id byte. */
        if (chip->id.len >= 5 && nand_is_slc(chip)) {
-                chip->ecc_step_ds = 512;
+                chip->base.eccreq.step_size = 512;
                switch (chip->id.data[4] & 0x3) {
                case 0x0:
-                        chip->ecc_strength_ds = 4;
+                        chip->base.eccreq.strength = 4;
                        break;
                case 0x1:
-                        chip->ecc_strength_ds = 2;
+                        chip->base.eccreq.strength = 2;
                        break;
                case 0x2:
-                        chip->ecc_strength_ds = 1;
+                        chip->base.eccreq.strength = 1;
                        break;
                default:
                        WARN(1, "Could not get ECC info");
-                        chip->ecc_step_ds = 0;
+                        chip->base.eccreq.step_size = 0;
                        break;
                }
        }
@@ -36,7 +36,14 @@ static void esmt_nand_decode_id(struct nand_chip *chip)
 static int esmt_nand_init(struct nand_chip *chip)
 {
        if (nand_is_slc(chip))
-                chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;
+                /*
+                 * It is known that some ESMT SLC NANDs have been shipped
+                 * with the factory bad block markers in the first or last page
+                 * of the block, instead of the first or second page. To be on
+                 * the safe side, let's check all three locations.
+                 */
+                chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE |
+                                 NAND_BBM_LASTPAGE;
        return 0;
 }
diff --git a/drivers/mtd/nand/raw/nand_hynix.c b/drivers/mtd/nand/raw/nand_hynix.c
index 343f477362d1..7c600c4d5ec8 100644
--- a/drivers/mtd/nand/raw/nand_hynix.c
+++ b/drivers/mtd/nand/raw/nand_hynix.c
@@ -418,24 +418,27 @@ static void hynix_nand_extract_oobsize(struct nand_chip *chip,
                                       bool valid_jedecid)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
        u8 oobsize;
+        memorg = nanddev_get_memorg(&chip->base);
        oobsize = ((chip->id.data[3] >> 2) & 0x3) |
                  ((chip->id.data[3] >> 4) & 0x4);
        if (valid_jedecid) {
                switch (oobsize) {
                case 0:
-                        mtd->oobsize = 2048;
+                        memorg->oobsize = 2048;
                        break;
                case 1:
-                        mtd->oobsize = 1664;
+                        memorg->oobsize = 1664;
                        break;
                case 2:
-                        mtd->oobsize = 1024;
+                        memorg->oobsize = 1024;
                        break;
                case 3:
-                        mtd->oobsize = 640;
+                        memorg->oobsize = 640;
                        break;
                default:
                        /*
@@ -450,25 +453,25 @@ static void hynix_nand_extract_oobsize(struct nand_chip *chip,
        } else {
                switch (oobsize) {
                case 0:
-                        mtd->oobsize = 128;
+                        memorg->oobsize = 128;
                        break;
                case 1:
-                        mtd->oobsize = 224;
+                        memorg->oobsize = 224;
                        break;
                case 2:
-                        mtd->oobsize = 448;
+                        memorg->oobsize = 448;
                        break;
                case 3:
-                        mtd->oobsize = 64;
+                        memorg->oobsize = 64;
                        break;
                case 4:
-                        mtd->oobsize = 32;
+                        memorg->oobsize = 32;
                        break;
                case 5:
-                        mtd->oobsize = 16;
+                        memorg->oobsize = 16;
                        break;
                case 6:
-                        mtd->oobsize = 640;
+                        memorg->oobsize = 640;
                        break;
                default:
                        /*
@@ -492,8 +495,10 @@ static void hynix_nand_extract_oobsize(struct nand_chip *chip,
                 * the actual OOB size for this chip is: 640 * 16k / 8k).
                 */
                if (chip->id.data[1] == 0xde)
-                        mtd->oobsize *= mtd->writesize / SZ_8K;
+                        memorg->oobsize *= memorg->pagesize / SZ_8K;
        }
+        mtd->oobsize = memorg->oobsize;
 }
 static void hynix_nand_extract_ecc_requirements(struct nand_chip *chip,
@@ -503,30 +508,30 @@ static void hynix_nand_extract_ecc_requirements(struct nand_chip *chip,
        if (valid_jedecid) {
                /* Reference: H27UCG8T2E datasheet */
-                chip->ecc_step_ds = 1024;
+                chip->base.eccreq.step_size = 1024;
                switch (ecc_level) {
                case 0:
-                        chip->ecc_step_ds = 0;
+                        chip->base.eccreq.step_size = 0;
-                        chip->ecc_strength_ds = 0;
+                        chip->base.eccreq.strength = 0;
                        break;
                case 1:
-                        chip->ecc_strength_ds = 4;
+                        chip->base.eccreq.strength = 4;
                        break;
                case 2:
-                        chip->ecc_strength_ds = 24;
+                        chip->base.eccreq.strength = 24;
                        break;
                case 3:
-                        chip->ecc_strength_ds = 32;
+                        chip->base.eccreq.strength = 32;
                        break;
                case 4:
-                        chip->ecc_strength_ds = 40;
+                        chip->base.eccreq.strength = 40;
                        break;
                case 5:
-                        chip->ecc_strength_ds = 50;
+                        chip->base.eccreq.strength = 50;
                        break;
                case 6:
-                        chip->ecc_strength_ds = 60;
+                        chip->base.eccreq.strength = 60;
                        break;
                default:
                        /*
@@ -547,14 +552,14 @@ static void hynix_nand_extract_ecc_requirements(struct nand_chip *chip,
                if (nand_tech < 3) {
                        /* > 26nm, reference: H27UBG8T2A datasheet */
                        if (ecc_level < 5) {
-                                chip->ecc_step_ds = 512;
+                                chip->base.eccreq.step_size = 512;
-                                chip->ecc_strength_ds = 1 << ecc_level;
+                                chip->base.eccreq.strength = 1 << ecc_level;
                        } else if (ecc_level < 7) {
                                if (ecc_level == 5)
-                                        chip->ecc_step_ds = 2048;
+                                        chip->base.eccreq.step_size = 2048;
                                else
-                                        chip->ecc_step_ds = 1024;
+                                        chip->base.eccreq.step_size = 1024;
-                                chip->ecc_strength_ds = 24;
+                                chip->base.eccreq.strength = 24;
                        } else {
                                /*
                                 * We should never reach this case, but if that
@@ -567,14 +572,14 @@ static void hynix_nand_extract_ecc_requirements(struct nand_chip *chip,
                } else {
                        /* <= 26nm, reference: H27UBG8T2B datasheet */
                        if (!ecc_level) {
-                                chip->ecc_step_ds = 0;
+                                chip->base.eccreq.step_size = 0;
-                                chip->ecc_strength_ds = 0;
+                                chip->base.eccreq.strength = 0;
                        } else if (ecc_level < 5) {
-                                chip->ecc_step_ds = 512;
+                                chip->base.eccreq.step_size = 512;
-                                chip->ecc_strength_ds = 1 << (ecc_level - 1);
+                                chip->base.eccreq.strength = 1 << (ecc_level - 1);
                        } else {
-                                chip->ecc_step_ds = 1024;
+                                chip->base.eccreq.step_size = 1024;
-                                chip->ecc_strength_ds = 24 +
+                                chip->base.eccreq.strength = 24 +
                                                        (8 * (ecc_level - 5));
                        }
                }
@@ -587,7 +592,7 @@ static void hynix_nand_extract_scrambling_requirements(struct nand_chip *chip,
        u8 nand_tech;
        /* We need scrambling on all TLC NANDs*/
-        if (chip->bits_per_cell > 2)
+        if (nanddev_bits_per_cell(&chip->base) > 2)
                chip->options |= NAND_NEED_SCRAMBLING;
        /* And on MLC NANDs with sub-3xnm process */
@@ -609,9 +614,12 @@ static void hynix_nand_extract_scrambling_requirements(struct nand_chip *chip,
 static void hynix_nand_decode_id(struct nand_chip *chip)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
        bool valid_jedecid;
        u8 tmp;
+        memorg = nanddev_get_memorg(&chip->base);
        /*
         * Exclude all SLC NANDs from this advanced detection scheme.
         * According to the ranges defined in several datasheets, it might
@@ -625,7 +633,8 @@ static void hynix_nand_decode_id(struct nand_chip *chip)
        }
        /* Extract pagesize */
-        mtd->writesize = 2048 << (chip->id.data[3] & 0x03);
+        memorg->pagesize = 2048 << (chip->id.data[3] & 0x03);
+        mtd->writesize = memorg->pagesize;
        tmp = (chip->id.data[3] >> 4) & 0x3;
        /*
@@ -635,12 +644,19 @@ static void hynix_nand_decode_id(struct nand_chip *chip)
         * The only exception is when ID[3][4:5] == 3 and ID[3][7] == 0, in
         * this case the erasesize is set to 768KiB.
         */
-        if (chip->id.data[3] & 0x80)
+        if (chip->id.data[3] & 0x80) {
+                memorg->pages_per_eraseblock = (SZ_1M << tmp) /
+                                               memorg->pagesize;
                mtd->erasesize = SZ_1M << tmp;
-        else if (tmp == 3)
+        } else if (tmp == 3) {
+                memorg->pages_per_eraseblock = (SZ_512K + SZ_256K) /
+                                               memorg->pagesize;
                mtd->erasesize = SZ_512K + SZ_256K;
-        else
+        } else {
+                memorg->pages_per_eraseblock = (SZ_128K << tmp) /
+                                               memorg->pagesize;
                mtd->erasesize = SZ_128K << tmp;
+        }
        /*
         * Modern Toggle DDR NANDs have a valid JEDECID even though they are
@@ -672,9 +688,9 @@ static int hynix_nand_init(struct nand_chip *chip)
        int ret;
        if (!nand_is_slc(chip))
-                chip->bbt_options |= NAND_BBT_SCANLASTPAGE;
+                chip->options |= NAND_BBM_LASTPAGE;
        else
-                chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;
+                chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
        hynix = kzalloc(sizeof(*hynix), GFP_KERNEL);
        if (!hynix)
diff --git a/drivers/mtd/nand/raw/nand_jedec.c b/drivers/mtd/nand/raw/nand_jedec.c
index 38b5dc22cb30..9b540e76f84f 100644
--- a/drivers/mtd/nand/raw/nand_jedec.c
+++ b/drivers/mtd/nand/raw/nand_jedec.c
@@ -22,12 +22,15 @@
 int nand_jedec_detect(struct nand_chip *chip)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
        struct nand_jedec_params *p;
        struct jedec_ecc_info *ecc;
        int jedec_version = 0;
        char id[5];
        int i, val, ret;
+        memorg = nanddev_get_memorg(&chip->base);
        /* Try JEDEC for unknown chip or LP */
        ret = nand_readid_op(chip, 0x40, id, sizeof(id));
        if (ret || strncmp(id, "JEDEC", sizeof(id)))
@@ -81,18 +84,24 @@ int nand_jedec_detect(struct nand_chip *chip)
                goto free_jedec_param_page;
        }
-        mtd->writesize = le32_to_cpu(p->byte_per_page);
+        memorg->pagesize = le32_to_cpu(p->byte_per_page);
+        mtd->writesize = memorg->pagesize;
        /* Please reference to the comment for nand_flash_detect_onfi. */
-        mtd->erasesize = 1 << (fls(le32_to_cpu(p->pages_per_block)) - 1);
+        memorg->pages_per_eraseblock =
-        mtd->erasesize *= mtd->writesize;
+                        1 << (fls(le32_to_cpu(p->pages_per_block)) - 1);
+        mtd->erasesize = memorg->pages_per_eraseblock * memorg->pagesize;
+        memorg->oobsize = le16_to_cpu(p->spare_bytes_per_page);
+        mtd->oobsize = memorg->oobsize;
-        mtd->oobsize = le16_to_cpu(p->spare_bytes_per_page);
+        memorg->luns_per_target = p->lun_count;
+        memorg->planes_per_lun = 1 << p->multi_plane_addr;
        /* Please reference to the comment for nand_flash_detect_onfi. */
-        chip->chipsize = 1 << (fls(le32_to_cpu(p->blocks_per_lun)) - 1);
+        memorg->eraseblocks_per_lun =
-        chip->chipsize *= (uint64_t)mtd->erasesize * p->lun_count;
+                1 << (fls(le32_to_cpu(p->blocks_per_lun)) - 1);
-        chip->bits_per_cell = p->bits_per_cell;
+        memorg->bits_per_cell = p->bits_per_cell;
        if (le16_to_cpu(p->features) & JEDEC_FEATURE_16_BIT_BUS)
                chip->options |= NAND_BUSWIDTH_16;
@@ -101,8 +110,8 @@ int nand_jedec_detect(struct nand_chip *chip)
        ecc = &p->ecc_info[0];
        if (ecc->codeword_size >= 9) {
-                chip->ecc_strength_ds = ecc->ecc_bits;
+                chip->base.eccreq.strength = ecc->ecc_bits;
-                chip->ecc_step_ds = 1 << ecc->codeword_size;
+                chip->base.eccreq.step_size = 1 << ecc->codeword_size;
        } else {
                pr_warn("Invalid codeword size\n");
        }
diff --git a/drivers/mtd/nand/raw/nand_macronix.c b/drivers/mtd/nand/raw/nand_macronix.c
index 47d8cda547cf..e287e71347c5 100644
--- a/drivers/mtd/nand/raw/nand_macronix.c
+++ b/drivers/mtd/nand/raw/nand_macronix.c
@@ -62,7 +62,7 @@ static void macronix_nand_fix_broken_get_timings(struct nand_chip *chip)
 static int macronix_nand_init(struct nand_chip *chip)
 {
        if (nand_is_slc(chip))
-                chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;
+                chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
        macronix_nand_fix_broken_get_timings(chip);
diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c
index b85e1c13b79e..cbd4f09ac178 100644
--- a/drivers/mtd/nand/raw/nand_micron.c
+++ b/drivers/mtd/nand/raw/nand_micron.c
@@ -385,13 +385,13 @@ static int micron_supports_on_die_ecc(struct nand_chip *chip)
        if (!chip->parameters.onfi)
                return MICRON_ON_DIE_UNSUPPORTED;
-        if (chip->bits_per_cell != 1)
+        if (nanddev_bits_per_cell(&chip->base) != 1)
                return MICRON_ON_DIE_UNSUPPORTED;
        /*
         * We only support on-die ECC of 4/512 or 8/512
         */
-        if  (chip->ecc_strength_ds != 4 && chip->ecc_strength_ds != 8)
+        if  (chip->base.eccreq.strength != 4 && chip->base.eccreq.strength != 8)
                return MICRON_ON_DIE_UNSUPPORTED;
        /* 0x2 means on-die ECC is available. */
@@ -424,7 +424,7 @@ static int micron_supports_on_die_ecc(struct nand_chip *chip)
        /*
         * We only support on-die ECC of 4/512 or 8/512
         */
-        if  (chip->ecc_strength_ds != 4 && chip->ecc_strength_ds != 8)
+        if  (chip->base.eccreq.strength != 4 && chip->base.eccreq.strength != 8)
                return MICRON_ON_DIE_UNSUPPORTED;
        return MICRON_ON_DIE_SUPPORTED;
@@ -448,7 +448,7 @@ static int micron_nand_init(struct nand_chip *chip)
                goto err_free_manuf_data;
        if (mtd->writesize == 2048)
-                chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;
+                chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
        ondie = micron_supports_on_die_ecc(chip);
@@ -479,7 +479,7 @@ static int micron_nand_init(struct nand_chip *chip)
                 * That's not needed for 8-bit ECC, because the status expose
                 * a better approximation of the number of bitflips in a page.
                 */
-                if (chip->ecc_strength_ds == 4) {
+                if (chip->base.eccreq.strength == 4) {
                        micron->ecc.rawbuf = kmalloc(mtd->writesize +
                                                     mtd->oobsize,
                                                     GFP_KERNEL);
@@ -489,16 +489,16 @@ static int micron_nand_init(struct nand_chip *chip)
                        }
                }
-                if (chip->ecc_strength_ds == 4)
+                if (chip->base.eccreq.strength == 4)
                        mtd_set_ooblayout(mtd,
                                          &micron_nand_on_die_4_ooblayout_ops);
                else
                        mtd_set_ooblayout(mtd,
                                          &micron_nand_on_die_8_ooblayout_ops);
-                chip->ecc.bytes = chip->ecc_strength_ds * 2;
+                chip->ecc.bytes = chip->base.eccreq.strength * 2;
                chip->ecc.size = 512;
-                chip->ecc.strength = chip->ecc_strength_ds;
+                chip->ecc.strength = chip->base.eccreq.strength;
                chip->ecc.algo = NAND_ECC_BCH;
                chip->ecc.read_page = micron_nand_read_page_on_die_ecc;
                chip->ecc.write_page = micron_nand_write_page_on_die_ecc;
diff --git a/drivers/mtd/nand/raw/nand_onfi.c b/drivers/mtd/nand/raw/nand_onfi.c
index d8184cf591ad..0b879bd0a68c 100644
--- a/drivers/mtd/nand/raw/nand_onfi.c
+++ b/drivers/mtd/nand/raw/nand_onfi.c
@@ -94,8 +94,8 @@ static int nand_flash_detect_ext_param_page(struct nand_chip *chip,
                goto ext_out;
        }
-        chip->ecc_strength_ds = ecc->ecc_bits;
+        chip->base.eccreq.strength = ecc->ecc_bits;
-        chip->ecc_step_ds = 1 << ecc->codeword_size;
+        chip->base.eccreq.step_size = 1 << ecc->codeword_size;
        ret = 0;
 ext_out:
@@ -140,12 +140,15 @@ static void nand_bit_wise_majority(const void **srcbufs,
 int nand_onfi_detect(struct nand_chip *chip)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
        struct nand_onfi_params *p;
        struct onfi_params *onfi;
        int onfi_version = 0;
        char id[4];
        int i, ret, val;
+        memorg = nanddev_get_memorg(&chip->base);
        /* Try ONFI for unknown chip or LP */
        ret = nand_readid_op(chip, 0x20, id, sizeof(id));
        if (ret || strncmp(id, "ONFI", 4))
@@ -221,32 +224,36 @@ int nand_onfi_detect(struct nand_chip *chip)
                goto free_onfi_param_page;
        }
-        mtd->writesize = le32_to_cpu(p->byte_per_page);
+        memorg->pagesize = le32_to_cpu(p->byte_per_page);
+        mtd->writesize = memorg->pagesize;
        /*
         * pages_per_block and blocks_per_lun may not be a power-of-2 size
         * (don't ask me who thought of this...). MTD assumes that these
         * dimensions will be power-of-2, so just truncate the remaining area.
         */
-        mtd->erasesize = 1 << (fls(le32_to_cpu(p->pages_per_block)) - 1);
+        memorg->pages_per_eraseblock =
-        mtd->erasesize *= mtd->writesize;
+                        1 << (fls(le32_to_cpu(p->pages_per_block)) - 1);
+        mtd->erasesize = memorg->pages_per_eraseblock * memorg->pagesize;
-        mtd->oobsize = le16_to_cpu(p->spare_bytes_per_page);
+        memorg->oobsize = le16_to_cpu(p->spare_bytes_per_page);
+        mtd->oobsize = memorg->oobsize;
-        /* See erasesize comment */
+        memorg->luns_per_target = p->lun_count;
-        chip->chipsize = 1 << (fls(le32_to_cpu(p->blocks_per_lun)) - 1);
+        memorg->planes_per_lun = 1 << p->interleaved_bits;
-        chip->chipsize *= (uint64_t)mtd->erasesize * p->lun_count;
-        chip->bits_per_cell = p->bits_per_cell;
-        chip->max_bb_per_die = le16_to_cpu(p->bb_per_lun);
+        /* See erasesize comment */
-        chip->blocks_per_die = le32_to_cpu(p->blocks_per_lun);
+        memorg->eraseblocks_per_lun =
+                1 << (fls(le32_to_cpu(p->blocks_per_lun)) - 1);
+        memorg->max_bad_eraseblocks_per_lun = le32_to_cpu(p->blocks_per_lun);
+        memorg->bits_per_cell = p->bits_per_cell;
        if (le16_to_cpu(p->features) & ONFI_FEATURE_16_BIT_BUS)
                chip->options |= NAND_BUSWIDTH_16;
        if (p->ecc_bits != 0xff) {
-                chip->ecc_strength_ds = p->ecc_bits;
+                chip->base.eccreq.strength = p->ecc_bits;
-                chip->ecc_step_ds = 512;
+                chip->base.eccreq.step_size = 512;
        } else if (onfi_version >= 21 &&
                (le16_to_cpu(p->features) & ONFI_FEATURE_EXT_PARAM_PAGE)) {
diff --git a/drivers/mtd/nand/raw/nand_samsung.c b/drivers/mtd/nand/raw/nand_samsung.c
index e46d4c492ad8..5552ce20ede0 100644
--- a/drivers/mtd/nand/raw/nand_samsung.c
+++ b/drivers/mtd/nand/raw/nand_samsung.c
@@ -20,6 +20,9 @@
 static void samsung_nand_decode_id(struct nand_chip *chip)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
+        memorg = nanddev_get_memorg(&chip->base);
        /* New Samsung (6 byte ID): Samsung K9GAG08U0F (p.44) */
        if (chip->id.len == 6 && !nand_is_slc(chip) &&
@@ -27,29 +30,30 @@ static void samsung_nand_decode_id(struct nand_chip *chip)
                u8 extid = chip->id.data[3];
                /* Get pagesize */
-                mtd->writesize = 2048 << (extid & 0x03);
+                memorg->pagesize = 2048 << (extid & 0x03);
+                mtd->writesize = memorg->pagesize;
                extid >>= 2;
                /* Get oobsize */
                switch (((extid >> 2) & 0x4) | (extid & 0x3)) {
                case 1:
-                        mtd->oobsize = 128;
+                        memorg->oobsize = 128;
                        break;
                case 2:
-                        mtd->oobsize = 218;
+                        memorg->oobsize = 218;
                        break;
                case 3:
-                        mtd->oobsize = 400;
+                        memorg->oobsize = 400;
                        break;
                case 4:
-                        mtd->oobsize = 436;
+                        memorg->oobsize = 436;
                        break;
                case 5:
-                        mtd->oobsize = 512;
+                        memorg->oobsize = 512;
                        break;
                case 6:
-                        mtd->oobsize = 640;
+                        memorg->oobsize = 640;
                        break;
                default:
                        /*
@@ -62,31 +66,37 @@ static void samsung_nand_decode_id(struct nand_chip *chip)
                        break;
                }
+                mtd->oobsize = memorg->oobsize;
                /* Get blocksize */
                extid >>= 2;
+                memorg->pages_per_eraseblock = (128 * 1024) <<
+                                               (((extid >> 1) & 0x04) |
+                                                (extid & 0x03)) /
+                                               memorg->pagesize;
                mtd->erasesize = (128 * 1024) <<
                                 (((extid >> 1) & 0x04) | (extid & 0x03));
                /* Extract ECC requirements from 5th id byte*/
                extid = (chip->id.data[4] >> 4) & 0x07;
                if (extid < 5) {
-                        chip->ecc_step_ds = 512;
+                        chip->base.eccreq.step_size = 512;
-                        chip->ecc_strength_ds = 1 << extid;
+                        chip->base.eccreq.strength = 1 << extid;
                } else {
-                        chip->ecc_step_ds = 1024;
+                        chip->base.eccreq.step_size = 1024;
                        switch (extid) {
                        case 5:
-                                chip->ecc_strength_ds = 24;
+                                chip->base.eccreq.strength = 24;
                                break;
                        case 6:
-                                chip->ecc_strength_ds = 40;
+                                chip->base.eccreq.strength = 40;
                                break;
                        case 7:
-                                chip->ecc_strength_ds = 60;
+                                chip->base.eccreq.strength = 60;
                                break;
                        default:
                                WARN(1, "Could not decode ECC info");
-                                chip->ecc_step_ds = 0;
+                                chip->base.eccreq.step_size = 0;
                        }
                }
        } else {
@@ -96,8 +106,8 @@ static void samsung_nand_decode_id(struct nand_chip *chip)
                        switch (chip->id.data[1]) {
                        /* K9F4G08U0D-S[I|C]B0(T00) */
                        case 0xDC:
-                                chip->ecc_step_ds = 512;
+                                chip->base.eccreq.step_size = 512;
-                                chip->ecc_strength_ds = 1;
+                                chip->base.eccreq.strength = 1;
                                break;
                        /* K9F1G08U0E 21nm chips do not support subpage write */
@@ -121,9 +131,9 @@ static int samsung_nand_init(struct nand_chip *chip)
                chip->options |= NAND_SAMSUNG_LP_OPTIONS;
        if (!nand_is_slc(chip))
-                chip->bbt_options |= NAND_BBT_SCANLASTPAGE;
+                chip->options |= NAND_BBM_LASTPAGE;
        else
-                chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;
+                chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
        return 0;
 }
diff --git a/drivers/mtd/nand/raw/nand_toshiba.c b/drivers/mtd/nand/raw/nand_toshiba.c
index d068163b64b3..74ffcae48726 100644
--- a/drivers/mtd/nand/raw/nand_toshiba.c
+++ b/drivers/mtd/nand/raw/nand_toshiba.c
@@ -101,6 +101,9 @@ static void toshiba_nand_benand_init(struct nand_chip *chip)
 static void toshiba_nand_decode_id(struct nand_chip *chip)
 {
        struct mtd_info *mtd = nand_to_mtd(chip);
+        struct nand_memory_organization *memorg;
+        memorg = nanddev_get_memorg(&chip->base);
        nand_decode_ext_id(chip);
@@ -114,8 +117,10 @@ static void toshiba_nand_decode_id(struct nand_chip *chip)
         */
        if (chip->id.len >= 6 && nand_is_slc(chip) &&
            (chip->id.data[5] & 0x7) == 0x6 /* 24nm */ &&
-            !(chip->id.data[4] & 0x80) /* !BENAND */)
+            !(chip->id.data[4] & 0x80) /* !BENAND */) {
-                mtd->oobsize = 32 * mtd->writesize >> 9;
+                memorg->oobsize = 32 * memorg->pagesize >> 9;
+                mtd->oobsize = memorg->oobsize;
+        }
        /*
         * Extract ECC requirements from 6th id byte.
@@ -125,20 +130,20 @@ static void toshiba_nand_decode_id(struct nand_chip *chip)
         *  - 24nm: 8 bit ECC for each 512Byte is required.
         */
        if (chip->id.len >= 6 && nand_is_slc(chip)) {
-                chip->ecc_step_ds = 512;
+                chip->base.eccreq.step_size = 512;
                switch (chip->id.data[5] & 0x7) {
                case 0x4:
-                        chip->ecc_strength_ds = 1;
+                        chip->base.eccreq.strength = 1;
                        break;
                case 0x5:
-                        chip->ecc_strength_ds = 4;
+                        chip->base.eccreq.strength = 4;
                        break;
                case 0x6:
-                        chip->ecc_strength_ds = 8;
+                        chip->base.eccreq.strength = 8;
                        break;
                default:
                        WARN(1, "Could not get ECC info");
-                        chip->ecc_step_ds = 0;
+                        chip->base.eccreq.step_size = 0;
                        break;
                }
        }
@@ -147,7 +152,7 @@ static void toshiba_nand_decode_id(struct nand_chip *chip)
 static int toshiba_nand_init(struct nand_chip *chip)
 {
        if (nand_is_slc(chip))
-                chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;
+                chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
        /* Check that chip is BENAND and ECC mode is on-die */
        if (nand_is_slc(chip) && chip->ecc.mode == NAND_ECC_ON_DIE &&
diff --git a/drivers/mtd/nand/raw/nandsim.c b/drivers/mtd/nand/raw/nandsim.c
index 933d1a629c51..df63fa564082 100644
--- a/drivers/mtd/nand/raw/nandsim.c
+++ b/drivers/mtd/nand/raw/nandsim.c
@@ -298,6 +298,8 @@ union ns_mem {
 * The structure which describes all the internal simulator data.
 */
 struct nandsim {
+        struct nand_chip chip;
+        struct nand_controller base;
        struct mtd_partition partitions[CONFIG_NANDSIM_MAX_PARTS];
        unsigned int nbparts;
@@ -644,9 +646,6 @@ static int __init init_nandsim(struct mtd_info *mtd)
                return -EIO;
        }
-        /* Force mtd to not do delays */
-        chip->legacy.chip_delay = 0;
        /* Initialize the NAND flash parameters */
        ns->busw = chip->options & NAND_BUSWIDTH_16 ? 16 : 8;
        ns->geom.totsz    = mtd->size;
@@ -2076,24 +2075,6 @@ static void ns_nand_write_byte(struct nand_chip *chip, u_char byte)
        return;
 }
-static void ns_hwcontrol(struct nand_chip *chip, int cmd, unsigned int bitmask)
-{
-        struct nandsim *ns = nand_get_controller_data(chip);
-        ns->lines.cle = bitmask & NAND_CLE ? 1 : 0;
-        ns->lines.ale = bitmask & NAND_ALE ? 1 : 0;
-        ns->lines.ce = bitmask & NAND_NCE ? 1 : 0;
-        if (cmd != NAND_CMD_NONE)
-                ns_nand_write_byte(chip, cmd);
-}
-static int ns_device_ready(struct nand_chip *chip)
-{
-        NS_DBG("device_ready\n");
-        return 1;
-}
 static void ns_nand_write_buf(struct nand_chip *chip, const u_char *buf,
                              int len)
 {
@@ -2145,7 +2126,7 @@ static void ns_nand_read_buf(struct nand_chip *chip, u_char *buf, int len)
                int i;
                for (i = 0; i < len; i++)
-                        buf[i] = chip->legacy.read_byte(chip);
+                        buf[i] = ns_nand_read_byte(chip);
                return;
        }
@@ -2168,6 +2149,46 @@ static void ns_nand_read_buf(struct nand_chip *chip, u_char *buf, int len)
        return;
 }
+static int ns_exec_op(struct nand_chip *chip, const struct nand_operation *op,
+                      bool check_only)
+{
+        int i;
+        unsigned int op_id;
+        const struct nand_op_instr *instr = NULL;
+        struct nandsim *ns = nand_get_controller_data(chip);
+        ns->lines.ce = 1;
+        for (op_id = 0; op_id < op->ninstrs; op_id++) {
+                instr = &op->instrs[op_id];
+                ns->lines.cle = 0;
+                ns->lines.ale = 0;
+                switch (instr->type) {
+                case NAND_OP_CMD_INSTR:
+                        ns->lines.cle = 1;
+                        ns_nand_write_byte(chip, instr->ctx.cmd.opcode);
+                        break;
+                case NAND_OP_ADDR_INSTR:
+                        ns->lines.ale = 1;
+                        for (i = 0; i < instr->ctx.addr.naddrs; i++)
+                                ns_nand_write_byte(chip, instr->ctx.addr.addrs[i]);
+                        break;
+                case NAND_OP_DATA_IN_INSTR:
+                        ns_nand_read_buf(chip, instr->ctx.data.buf.in, instr->ctx.data.len);
+                        break;
+                case NAND_OP_DATA_OUT_INSTR:
+                        ns_nand_write_buf(chip, instr->ctx.data.buf.out, instr->ctx.data.len);
+                        break;
+                case NAND_OP_WAITRDY_INSTR:
+                        /* we are always ready */
+                        break;
+                }
+        }
+        return 0;
+}
 static int ns_attach_chip(struct nand_chip *chip)
 {
        unsigned int eccsteps, eccbytes;
@@ -2208,6 +2229,7 @@ static int ns_attach_chip(struct nand_chip *chip)
 static const struct nand_controller_ops ns_controller_ops = {
        .attach_chip = ns_attach_chip,
+        .exec_op = ns_exec_op,
 };
 /*
@@ -2216,7 +2238,7 @@ static const struct nand_controller_ops ns_controller_ops = {
 static int __init ns_init_module(void)
 {
        struct nand_chip *chip;
-        struct nandsim *nand;
+        struct nandsim *ns;
        int retval = -ENOMEM, i;
        if (bus_width != 8 && bus_width != 16) {
@@ -2224,25 +2246,15 @@ static int __init ns_init_module(void)
                return -EINVAL;
        }
-        /* Allocate and initialize mtd_info, nand_chip and nandsim structures */
+        ns = kzalloc(sizeof(struct nandsim), GFP_KERNEL);
-        chip = kzalloc(sizeof(struct nand_chip) + sizeof(struct nandsim),
+        if (!ns) {
-                       GFP_KERNEL);
-        if (!chip) {
                NS_ERR("unable to allocate core structures.\n");
                return -ENOMEM;
        }
+        chip        = &ns->chip;
        nsmtd       = nand_to_mtd(chip);
-        nand        = (struct nandsim *)(chip + 1);
+        nand_set_controller_data(chip, (void *)ns);
-        nand_set_controller_data(chip, (void *)nand);
-        /*
-         * Register simulator's callbacks.
-         */
-        chip->legacy.cmd_ctrl    = ns_hwcontrol;
-        chip->legacy.read_byte  = ns_nand_read_byte;
-        chip->legacy.dev_ready  = ns_device_ready;
-        chip->legacy.write_buf  = ns_nand_write_buf;
-        chip->legacy.read_buf   = ns_nand_read_buf;
        chip->ecc.mode   = NAND_ECC_SOFT;
        chip->ecc.algo   = NAND_ECC_HAMMING;
        /* The NAND_SKIP_BBTSCAN option is necessary for 'overridesize' */
@@ -2251,9 +2263,11 @@ static int __init ns_init_module(void)
        switch (bbt) {
        case 2:
-                 chip->bbt_options |= NAND_BBT_NO_OOB;
+                chip->bbt_options |= NAND_BBT_NO_OOB;
+                /* fall through */
        case 1:
-                 chip->bbt_options |= NAND_BBT_USE_FLASH;
+                chip->bbt_options |= NAND_BBT_USE_FLASH;
+                /* fall through */
        case 0:
                break;
        default:
@@ -2266,19 +2280,19 @@ static int __init ns_init_module(void)
         * the initial ID read command correctly
         */
        if (id_bytes[6] != 0xFF || id_bytes[7] != 0xFF)
-                nand->geom.idbytes = 8;
+                ns->geom.idbytes = 8;
        else if (id_bytes[4] != 0xFF || id_bytes[5] != 0xFF)
-                nand->geom.idbytes = 6;
+                ns->geom.idbytes = 6;
        else if (id_bytes[2] != 0xFF || id_bytes[3] != 0xFF)
-                nand->geom.idbytes = 4;
+                ns->geom.idbytes = 4;
        else
-                nand->geom.idbytes = 2;
+                ns->geom.idbytes = 2;
-        nand->regs.status = NS_STATUS_OK(nand);
+        ns->regs.status = NS_STATUS_OK(ns);
-        nand->nxstate = STATE_UNKNOWN;
+        ns->nxstate = STATE_UNKNOWN;
-        nand->options |= OPT_PAGE512; /* temporary value */
+        ns->options |= OPT_PAGE512; /* temporary value */
-        memcpy(nand->ids, id_bytes, sizeof(nand->ids));
+        memcpy(ns->ids, id_bytes, sizeof(ns->ids));
        if (bus_width == 16) {
-                nand->busw = 16;
+                ns->busw = 16;
                chip->options |= NAND_BUSWIDTH_16;
        }
@@ -2293,7 +2307,10 @@ static int __init ns_init_module(void)
        if ((retval = parse_gravepages()) != 0)
                goto error;
-        chip->legacy.dummy_controller.ops = &ns_controller_ops;
+        nand_controller_init(&ns->base);
+        ns->base.ops = &ns_controller_ops;
+        chip->controller = &ns->base;
        retval = nand_scan(chip, 1);
        if (retval) {
                NS_ERR("Could not scan NAND Simulator device\n");
@@ -2302,16 +2319,23 @@ static int __init ns_init_module(void)
        if (overridesize) {
                uint64_t new_size = (uint64_t)nsmtd->erasesize << overridesize;
+                struct nand_memory_organization *memorg;
+                u64 targetsize;
+                memorg = nanddev_get_memorg(&chip->base);
                if (new_size >> overridesize != nsmtd->erasesize) {
                        NS_ERR("overridesize is too big\n");
                        retval = -EINVAL;
                        goto err_exit;
                }
                /* N.B. This relies on nand_scan not doing anything with the size before we change it */
                nsmtd->size = new_size;
-                chip->chipsize = new_size;
+                memorg->eraseblocks_per_lun = 1 << overridesize;
+                targetsize = nanddev_target_size(&chip->base);
                chip->chip_shift = ffs(nsmtd->erasesize) + overridesize - 1;
-                chip->pagemask = (chip->chipsize >> chip->page_shift) - 1;
+                chip->pagemask = (targetsize >> chip->page_shift) - 1;
        }
        if ((retval = setup_wear_reporting(nsmtd)) != 0)
@@ -2323,27 +2347,27 @@ static int __init ns_init_module(void)
        if ((retval = nand_create_bbt(chip)) != 0)
                goto err_exit;
-        if ((retval = parse_badblocks(nand, nsmtd)) != 0)
+        if ((retval = parse_badblocks(ns, nsmtd)) != 0)
                goto err_exit;
        /* Register NAND partitions */
-        retval = mtd_device_register(nsmtd, &nand->partitions[0],
+        retval = mtd_device_register(nsmtd, &ns->partitions[0],
-                                     nand->nbparts);
+                                     ns->nbparts);
        if (retval != 0)
                goto err_exit;
-        if ((retval = nandsim_debugfs_create(nand)) != 0)
+        if ((retval = nandsim_debugfs_create(ns)) != 0)
                goto err_exit;
        return 0;
 err_exit:
-        free_nandsim(nand);
+        free_nandsim(ns);
        nand_release(chip);
-        for (i = 0;i < ARRAY_SIZE(nand->partitions); ++i)
+        for (i = 0;i < ARRAY_SIZE(ns->partitions); ++i)
-                kfree(nand->partitions[i].name);
+                kfree(ns->partitions[i].name);
 error:
-        kfree(chip);
+        kfree(ns);
        free_lists();
        return retval;
@@ -2364,7 +2388,7 @@ static void __exit ns_cleanup_module(void)
        nand_release(chip); /* Unregister driver */
        for (i = 0;i < ARRAY_SIZE(ns->partitions); ++i)
                kfree(ns->partitions[i].name);
-        kfree(mtd_to_nand(nsmtd));        /* Free other structures */
+        kfree(ns);        /* Free other structures */
        free_lists();
 }
diff --git a/drivers/mtd/nand/raw/nuc900_nand.c b/drivers/mtd/nand/raw/nuc900_nand.c
index 38b1994e7ed3..56fa84029482 100644
--- a/drivers/mtd/nand/raw/nuc900_nand.c
+++ b/drivers/mtd/nand/raw/nuc900_nand.c
@@ -192,8 +192,9 @@ static void nuc900_nand_command_lp(struct nand_chip *chip,
                return;
        case NAND_CMD_READ0:
                write_cmd_reg(nand, NAND_CMD_READSTART);
+                /* fall through */
        default:
                if (!chip->legacy.dev_ready) {
diff --git a/drivers/mtd/nand/raw/omap2.c b/drivers/mtd/nand/raw/omap2.c
index 8f280a2962c8..a9a275342a41 100644
--- a/drivers/mtd/nand/raw/omap2.c
+++ b/drivers/mtd/nand/raw/omap2.c
@@ -1725,9 +1725,9 @@ static bool omap2_nand_ecc_check(struct omap_nand_info *info)
                break;
        }
-        if (ecc_needs_bch && !IS_ENABLED(CONFIG_MTD_NAND_ECC_BCH)) {
+        if (ecc_needs_bch && !IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_BCH)) {
                dev_err(&info->pdev->dev,
-                        "CONFIG_MTD_NAND_ECC_BCH not enabled\n");
+                        "CONFIG_MTD_NAND_ECC_SW_BCH not enabled\n");
                return false;
        }
        if (ecc_needs_omap_bch && !IS_ENABLED(CONFIG_MTD_NAND_OMAP_BCH)) {
diff --git a/drivers/mtd/nand/raw/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c
index a3f32f939cc1..94c6401ef32f 100644
--- a/drivers/mtd/nand/raw/omap_elm.c
+++ b/drivers/mtd/nand/raw/omap_elm.c
@@ -465,11 +465,13 @@ static int elm_context_save(struct elm_info *info)
                                        ELM_SYNDROME_FRAGMENT_5 + offset);
                        regs->elm_syndrome_fragment_4[i] = elm_read_reg(info,
                                        ELM_SYNDROME_FRAGMENT_4 + offset);
+                        /* fall through */
                case BCH8_ECC:
                        regs->elm_syndrome_fragment_3[i] = elm_read_reg(info,
                                        ELM_SYNDROME_FRAGMENT_3 + offset);
                        regs->elm_syndrome_fragment_2[i] = elm_read_reg(info,
                                        ELM_SYNDROME_FRAGMENT_2 + offset);
+                        /* fall through */
                case BCH4_ECC:
                        regs->elm_syndrome_fragment_1[i] = elm_read_reg(info,
                                        ELM_SYNDROME_FRAGMENT_1 + offset);
@@ -511,11 +513,13 @@ static int elm_context_restore(struct elm_info *info)
                                        regs->elm_syndrome_fragment_5[i]);
                        elm_write_reg(info, ELM_SYNDROME_FRAGMENT_4 + offset,
                                        regs->elm_syndrome_fragment_4[i]);
+                        /* fall through */
                case BCH8_ECC:
                        elm_write_reg(info, ELM_SYNDROME_FRAGMENT_3 + offset,
                                        regs->elm_syndrome_fragment_3[i]);
                        elm_write_reg(info, ELM_SYNDROME_FRAGMENT_2 + offset,
                                        regs->elm_syndrome_fragment_2[i]);
+                        /* fall through */
                case BCH4_ECC:
                        elm_write_reg(info, ELM_SYNDROME_FRAGMENT_1 + offset,
                                        regs->elm_syndrome_fragment_1[i]);
diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index 920e7375084f..6ead55e05b80 100644
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -1680,14 +1680,12 @@ check_for_erased_page(struct qcom_nand_host *host, u8 *data_buf,
        u8 *cw_data_buf, *cw_oob_buf;
        int cw, data_size, oob_size, ret = 0;
-        if (!data_buf) {
+        if (!data_buf)
-                data_buf = chip->data_buf;
+                data_buf = nand_get_data_buf(chip);
-                chip->pagebuf = -1;
-        }
        if (!oob_buf) {
+                nand_get_data_buf(chip);
                oob_buf = chip->oob_poi;
-                chip->pagebuf = -1;
        }
        for_each_set_bit(cw, &uncorrectable_cws, ecc->steps) {
diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c
index cf6b1be1cf9c..e509c93737c4 100644
--- a/drivers/mtd/nand/raw/sh_flctl.c
+++ b/drivers/mtd/nand/raw/sh_flctl.c
@@ -101,14 +101,12 @@ static const struct mtd_ooblayout_ops flctl_4secc_oob_largepage_ops = {
 static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 static struct nand_bbt_descr flctl_4secc_smallpage = {
-        .options = NAND_BBT_SCAN2NDPAGE,
        .offs = 11,
        .len = 1,
        .pattern = scan_ff_pattern,
 };
 static struct nand_bbt_descr flctl_4secc_largepage = {
-        .options = NAND_BBT_SCAN2NDPAGE,
        .offs = 0,
        .len = 2,
        .pattern = scan_ff_pattern,
@@ -986,6 +984,7 @@ static void flctl_read_buf(struct nand_chip *chip, uint8_t *buf, int len)
 static int flctl_chip_attach_chip(struct nand_chip *chip)
 {
+        u64 targetsize = nanddev_target_size(&chip->base);
        struct mtd_info *mtd = nand_to_mtd(chip);
        struct sh_flctl *flctl = mtd_to_flctl(mtd);
@@ -998,11 +997,11 @@ static int flctl_chip_attach_chip(struct nand_chip *chip)
        if (mtd->writesize == 512) {
                flctl->page_size = 0;
-                if (chip->chipsize > (32 << 20)) {
+                if (targetsize > (32 << 20)) {
                        /* big than 32MB */
                        flctl->rw_ADRCNT = ADRCNT_4;
                        flctl->erase_ADRCNT = ADRCNT_3;
-                } else if (chip->chipsize > (2 << 16)) {
+                } else if (targetsize > (2 << 16)) {
                        /* big than 128KB */
                        flctl->rw_ADRCNT = ADRCNT_3;
                        flctl->erase_ADRCNT = ADRCNT_2;
@@ -1012,11 +1011,11 @@ static int flctl_chip_attach_chip(struct nand_chip *chip)
                }
        } else {
                flctl->page_size = 1;
-                if (chip->chipsize > (128 << 20)) {
+                if (targetsize > (128 << 20)) {
                        /* big than 128MB */
                        flctl->rw_ADRCNT = ADRCNT2_E;
                        flctl->erase_ADRCNT = ADRCNT_3;
-                } else if (chip->chipsize > (8 << 16)) {
+                } else if (targetsize > (8 << 16)) {
                        /* big than 512KB */
                        flctl->rw_ADRCNT = ADRCNT_4;
                        flctl->erase_ADRCNT = ADRCNT_2;
@@ -1178,6 +1177,8 @@ static int flctl_probe(struct platform_device *pdev)
        if (pdata->flcmncr_val & SEL_16BIT)
                nand->options |= NAND_BUSWIDTH_16;
+        nand->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
        pm_runtime_enable(&pdev->dev);
        pm_runtime_resume(&pdev->dev);
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 4282bc477761..b021a5720b42 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -42,7 +42,8 @@
 #define NFC_REG_CMD             0x0024
 #define NFC_REG_RCMD_SET        0x0028
 #define NFC_REG_WCMD_SET        0x002C
-#define NFC_REG_IO_DATA         0x0030
+#define NFC_REG_A10_IO_DATA     0x0030
+#define NFC_REG_A23_IO_DATA     0x0300
 #define NFC_REG_ECC_CTL         0x0034
 #define NFC_REG_ECC_ST          0x0038
 #define NFC_REG_DEBUG           0x003C
@@ -200,6 +201,22 @@ static inline struct sunxi_nand_chip *to_sunxi_nand(struct nand_chip *nand)
        return container_of(nand, struct sunxi_nand_chip, nand);
 }
+/*
+ * NAND Controller capabilities structure: stores NAND controller capabilities
+ * for distinction between compatible strings.
+ *
+ * @sram_through_ahb:   On A23, we choose to access the internal RAM through AHB
+ *                      instead of MBUS (less configuration). A10, A10s, A13 and
+ *                      A20 use the MBUS but no extra configuration is needed.
+ * @reg_io_data:        I/O data register
+ * @dma_maxburst:       DMA maxburst
+ */
+struct sunxi_nfc_caps {
+        bool sram_through_ahb;
+        unsigned int reg_io_data;
+        unsigned int dma_maxburst;
+};
 /**
 * struct sunxi_nfc - stores sunxi NAND controller information
 *
@@ -228,6 +245,7 @@ struct sunxi_nfc {
        struct list_head chips;
        struct completion complete;
        struct dma_chan *dmac;
+        const struct sunxi_nfc_caps *caps;
 };
 static inline struct sunxi_nfc *to_sunxi_nfc(struct nand_controller *ctrl)
@@ -350,10 +368,29 @@ static int sunxi_nfc_dma_op_prepare(struct sunxi_nfc *nfc, const void *buf,
                goto err_unmap_buf;
        }
-        writel(readl(nfc->regs + NFC_REG_CTL) | NFC_RAM_METHOD,
+        /*
-               nfc->regs + NFC_REG_CTL);
+         * On A23, we suppose the "internal RAM" (p.12 of the NFC user manual)
+         * refers to the NAND controller's internal SRAM. This memory is mapped
+         * and so is accessible from the AHB. It seems that it can also be
+         * accessed by the MBUS. MBUS accesses are mandatory when using the
+         * internal DMA instead of the external DMA engine.
+         *
+         * During DMA I/O operation, either we access this memory from the AHB
+         * by clearing the NFC_RAM_METHOD bit, or we set the bit and use the
+         * MBUS. In this case, we should also configure the MBUS DMA length
+         * NFC_REG_MDMA_CNT(0xC4) to be chunksize * nchunks. NAND I/O over MBUS
+         * are also limited to 32kiB pages.
+         */
+        if (nfc->caps->sram_through_ahb)
+                writel(readl(nfc->regs + NFC_REG_CTL) & ~NFC_RAM_METHOD,
+                       nfc->regs + NFC_REG_CTL);
+        else
+                writel(readl(nfc->regs + NFC_REG_CTL) | NFC_RAM_METHOD,
+                       nfc->regs + NFC_REG_CTL);
        writel(nchunks, nfc->regs + NFC_REG_SECTOR_NUM);
        writel(chunksize, nfc->regs + NFC_REG_CNT);
        dmat = dmaengine_submit(dmad);
        ret = dma_submit_error(dmat);
@@ -1313,20 +1350,19 @@ pio_fallback:
 static int sunxi_nfc_hw_ecc_read_oob(struct nand_chip *nand, int page)
 {
-        nand->pagebuf = -1;
+        u8 *buf = nand_get_data_buf(nand);
-        return nand->ecc.read_page(nand, nand->data_buf, 1, page);
+        return nand->ecc.read_page(nand, buf, 1, page);
 }
 static int sunxi_nfc_hw_ecc_write_oob(struct nand_chip *nand, int page)
 {
        struct mtd_info *mtd = nand_to_mtd(nand);
+        u8 *buf = nand_get_data_buf(nand);
        int ret;
-        nand->pagebuf = -1;
+        memset(buf, 0xff, mtd->writesize);
+        ret = nand->ecc.write_page(nand, buf, 1, page);
-        memset(nand->data_buf, 0xff, mtd->writesize);
-        ret = nand->ecc.write_page(nand, nand->data_buf, 1, page);
        if (ret)
                return ret;
@@ -1724,8 +1760,8 @@ static int sunxi_nand_attach_chip(struct nand_chip *nand)
        nand->options |= NAND_SUBPAGE_READ;
        if (!ecc->size) {
-                ecc->size = nand->ecc_step_ds;
+                ecc->size = nand->base.eccreq.step_size;
-                ecc->strength = nand->ecc_strength_ds;
+                ecc->strength = nand->base.eccreq.strength;
        }
        if (!ecc->size || !ecc->strength)
@@ -2088,6 +2124,12 @@ static int sunxi_nfc_probe(struct platform_device *pdev)
                goto out_mod_clk_unprepare;
        }
+        nfc->caps = of_device_get_match_data(&pdev->dev);
+        if (!nfc->caps) {
+                ret = -EINVAL;
+                goto out_ahb_reset_reassert;
+        }
        ret = sunxi_nfc_rst(nfc);
        if (ret)
                goto out_ahb_reset_reassert;
@@ -2102,12 +2144,12 @@ static int sunxi_nfc_probe(struct platform_device *pdev)
        if (nfc->dmac) {
                struct dma_slave_config dmac_cfg = { };
-                dmac_cfg.src_addr = r->start + NFC_REG_IO_DATA;
+                dmac_cfg.src_addr = r->start + nfc->caps->reg_io_data;
                dmac_cfg.dst_addr = dmac_cfg.src_addr;
                dmac_cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
                dmac_cfg.dst_addr_width = dmac_cfg.src_addr_width;
-                dmac_cfg.src_maxburst = 4;
+                dmac_cfg.src_maxburst = nfc->caps->dma_maxburst;
-                dmac_cfg.dst_maxburst = 4;
+                dmac_cfg.dst_maxburst = nfc->caps->dma_maxburst;
                dmaengine_slave_config(nfc->dmac, &dmac_cfg);
        } else {
                dev_warn(dev, "failed to request rxtx DMA channel\n");
@@ -2152,8 +2194,26 @@ static int sunxi_nfc_remove(struct platform_device *pdev)
        return 0;
 }
+static const struct sunxi_nfc_caps sunxi_nfc_a10_caps = {
+        .reg_io_data = NFC_REG_A10_IO_DATA,
+        .dma_maxburst = 4,
+};
+static const struct sunxi_nfc_caps sunxi_nfc_a23_caps = {
+        .sram_through_ahb = true,
+        .reg_io_data = NFC_REG_A23_IO_DATA,
+        .dma_maxburst = 8,
+};
 static const struct of_device_id sunxi_nfc_ids[] = {
-        { .compatible = "allwinner,sun4i-a10-nand" },
+        {
+                .compatible = "allwinner,sun4i-a10-nand",
+                .data = &sunxi_nfc_a10_caps,
+        },
+        {
+                .compatible = "allwinner,sun8i-a23-nand-controller",
+                .data = &sunxi_nfc_a23_caps,
+        },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, sunxi_nfc_ids);
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index 13be32c38194..3cc9a4c41443 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -853,7 +853,7 @@ static int tegra_nand_get_strength(struct nand_chip *chip, const int *strength,
                } else {
                        strength_sel = strength[i];
-                        if (strength_sel < chip->ecc_strength_ds)
+                        if (strength_sel < chip->base.eccreq.strength)
                                continue;
                }
@@ -917,9 +917,9 @@ static int tegra_nand_attach_chip(struct nand_chip *chip)
        chip->ecc.mode = NAND_ECC_HW;
        chip->ecc.size = 512;
        chip->ecc.steps = mtd->writesize / chip->ecc.size;
-        if (chip->ecc_step_ds != 512) {
+        if (chip->base.eccreq.step_size != 512) {
                dev_err(ctrl->dev, "Unsupported step size %d\n",
-                        chip->ecc_step_ds);
+                        chip->base.eccreq.step_size);
                return -EINVAL;
        }
@@ -950,7 +950,7 @@ static int tegra_nand_attach_chip(struct nand_chip *chip)
                if (ret < 0) {
                        dev_err(ctrl->dev,
                                "No valid strength found, minimum %d\n",
-                                chip->ecc_strength_ds);
+                                chip->base.eccreq.strength);
                        return ret;
                }
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index a662ca1970e5..6d43ddb3332f 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -850,6 +850,9 @@ static int vf610_nfc_probe(struct platform_device *pdev)
        }
        of_id = of_match_device(vf610_nfc_dt_ids, &pdev->dev);
+        if (!of_id)
+                return -ENODEV;
        nfc->variant = (enum vf610_nfc_variant)of_id->data;
        for_each_available_child_of_node(nfc->dev->of_node, child) {
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index fa87ae28cdfe..4c15bb58c623 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -19,21 +19,6 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/spi-mem.h>
-static void spinand_cache_op_adjust_colum(struct spinand_device *spinand,
-                                          const struct nand_page_io_req *req,
-                                          u16 *column)
-{
-        struct nand_device *nand = spinand_to_nand(spinand);
-        unsigned int shift;
-        if (nand->memorg.planes_per_lun < 2)
-                return;
-        /* The plane number is passed in MSB just above the column address */
-        shift = fls(nand->memorg.pagesize);
-        *column |= req->pos.plane << shift;
-}
 static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val)
 {
        struct spi_mem_op op = SPINAND_GET_FEATURE_OP(reg,
@@ -227,27 +212,21 @@ static int spinand_load_page_op(struct spinand_device *spinand,
 static int spinand_read_from_cache_op(struct spinand_device *spinand,
                                      const struct nand_page_io_req *req)
 {
-        struct spi_mem_op op = *spinand->op_templates.read_cache;
        struct nand_device *nand = spinand_to_nand(spinand);
        struct mtd_info *mtd = nanddev_to_mtd(nand);
-        struct nand_page_io_req adjreq = *req;
+        struct spi_mem_dirmap_desc *rdesc;
        unsigned int nbytes = 0;
        void *buf = NULL;
        u16 column = 0;
-        int ret;
+        ssize_t ret;
        if (req->datalen) {
-                adjreq.datalen = nanddev_page_size(nand);
-                adjreq.dataoffs = 0;
-                adjreq.databuf.in = spinand->databuf;
                buf = spinand->databuf;
-                nbytes = adjreq.datalen;
+                nbytes = nanddev_page_size(nand);
+                column = 0;
        }
        if (req->ooblen) {
-                adjreq.ooblen = nanddev_per_page_oobsize(nand);
-                adjreq.ooboffs = 0;
-                adjreq.oobbuf.in = spinand->oobbuf;
                nbytes += nanddev_per_page_oobsize(nand);
                if (!buf) {
                        buf = spinand->oobbuf;
@@ -255,28 +234,19 @@ static int spinand_read_from_cache_op(struct spinand_device *spinand,
                }
        }
-        spinand_cache_op_adjust_colum(spinand, &adjreq, &column);
+        rdesc = spinand->dirmaps[req->pos.plane].rdesc;
-        op.addr.val = column;
-        /*
-         * Some controllers are limited in term of max RX data size. In this
-         * case, just repeat the READ_CACHE operation after updating the
-         * column.
-         */
        while (nbytes) {
-                op.data.buf.in = buf;
+                ret = spi_mem_dirmap_read(rdesc, column, nbytes, buf);
-                op.data.nbytes = nbytes;
+                if (ret < 0)
-                ret = spi_mem_adjust_op_size(spinand->spimem, &op);
-                if (ret)
                        return ret;
-                ret = spi_mem_exec_op(spinand->spimem, &op);
+                if (!ret || ret > nbytes)
-                if (ret)
+                        return -EIO;
-                        return ret;
-                buf += op.data.nbytes;
+                nbytes -= ret;
-                nbytes -= op.data.nbytes;
+                column += ret;
-                op.addr.val += op.data.nbytes;
+                buf += ret;
        }
        if (req->datalen)
@@ -300,14 +270,12 @@ static int spinand_read_from_cache_op(struct spinand_device *spinand,
 static int spinand_write_to_cache_op(struct spinand_device *spinand,
                                     const struct nand_page_io_req *req)
 {
-        struct spi_mem_op op = *spinand->op_templates.write_cache;
        struct nand_device *nand = spinand_to_nand(spinand);
        struct mtd_info *mtd = nanddev_to_mtd(nand);
-        struct nand_page_io_req adjreq = *req;
+        struct spi_mem_dirmap_desc *wdesc;
+        unsigned int nbytes, column = 0;
        void *buf = spinand->databuf;
-        unsigned int nbytes;
+        ssize_t ret;
-        u16 column = 0;
-        int ret;
        /*
         * Looks like PROGRAM LOAD (AKA write cache) does not necessarily reset
@@ -318,12 +286,6 @@ static int spinand_write_to_cache_op(struct spinand_device *spinand,
         */
        nbytes = nanddev_page_size(nand) + nanddev_per_page_oobsize(nand);
        memset(spinand->databuf, 0xff, nbytes);
-        adjreq.dataoffs = 0;
-        adjreq.datalen = nanddev_page_size(nand);
-        adjreq.databuf.out = spinand->databuf;
-        adjreq.ooblen = nanddev_per_page_oobsize(nand);
-        adjreq.ooboffs = 0;
-        adjreq.oobbuf.out = spinand->oobbuf;
        if (req->datalen)
                memcpy(spinand->databuf + req->dataoffs, req->databuf.out,
@@ -340,42 +302,19 @@ static int spinand_write_to_cache_op(struct spinand_device *spinand,
                               req->ooblen);
        }
-        spinand_cache_op_adjust_colum(spinand, &adjreq, &column);
+        wdesc = spinand->dirmaps[req->pos.plane].wdesc;
-        op = *spinand->op_templates.write_cache;
-        op.addr.val = column;
-        /*
-         * Some controllers are limited in term of max TX data size. In this
-         * case, split the operation into one LOAD CACHE and one or more
-         * LOAD RANDOM CACHE.
-         */
        while (nbytes) {
-                op.data.buf.out = buf;
+                ret = spi_mem_dirmap_write(wdesc, column, nbytes, buf);
-                op.data.nbytes = nbytes;
+                if (ret < 0)
-                ret = spi_mem_adjust_op_size(spinand->spimem, &op);
-                if (ret)
-                        return ret;
-                ret = spi_mem_exec_op(spinand->spimem, &op);
-                if (ret)
                        return ret;
-                buf += op.data.nbytes;
+                if (!ret || ret > nbytes)
-                nbytes -= op.data.nbytes;
+                        return -EIO;
-                op.addr.val += op.data.nbytes;
-                /*
+                nbytes -= ret;
-                 * We need to use the RANDOM LOAD CACHE operation if there's
+                column += ret;
-                 * more than one iteration, because the LOAD operation might
+                buf += ret;
-                 * reset the cache to 0xff.
-                 */
-                if (nbytes) {
-                        column = op.addr.val;
-                        op = *spinand->op_templates.update_cache;
-                        op.addr.val = column;
-                }
        }
        return 0;
@@ -755,6 +694,59 @@ static int spinand_mtd_block_isreserved(struct mtd_info *mtd, loff_t offs)
        return ret;
 }
+static int spinand_create_dirmap(struct spinand_device *spinand,
+                                 unsigned int plane)
+{
+        struct nand_device *nand = spinand_to_nand(spinand);
+        struct spi_mem_dirmap_info info = {
+                .length = nanddev_page_size(nand) +
+                          nanddev_per_page_oobsize(nand),
+        };
+        struct spi_mem_dirmap_desc *desc;
+        /* The plane number is passed in MSB just above the column address */
+        info.offset = plane << fls(nand->memorg.pagesize);
+        info.op_tmpl = *spinand->op_templates.update_cache;
+        desc = devm_spi_mem_dirmap_create(&spinand->spimem->spi->dev,
+                                          spinand->spimem, &info);
+        if (IS_ERR(desc))
+                return PTR_ERR(desc);
+        spinand->dirmaps[plane].wdesc = desc;
+        info.op_tmpl = *spinand->op_templates.read_cache;
+        desc = devm_spi_mem_dirmap_create(&spinand->spimem->spi->dev,
+                                          spinand->spimem, &info);
+        if (IS_ERR(desc))
+                return PTR_ERR(desc);
+        spinand->dirmaps[plane].rdesc = desc;
+        return 0;
+}
+static int spinand_create_dirmaps(struct spinand_device *spinand)
+{
+        struct nand_device *nand = spinand_to_nand(spinand);
+        int i, ret;
+        spinand->dirmaps = devm_kzalloc(&spinand->spimem->spi->dev,
+                                        sizeof(*spinand->dirmaps) *
+                                        nand->memorg.planes_per_lun,
+                                        GFP_KERNEL);
+        if (!spinand->dirmaps)
+                return -ENOMEM;
+        for (i = 0; i < nand->memorg.planes_per_lun; i++) {
+                ret = spinand_create_dirmap(spinand, i);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
 static const struct nand_ops spinand_ops = {
        .erase = spinand_erase,
        .markbad = spinand_markbad,
@@ -1012,6 +1004,14 @@ static int spinand_init(struct spinand_device *spinand)
                goto err_free_bufs;
        }
+        ret = spinand_create_dirmaps(spinand);
+        if (ret) {
+                dev_err(dev,
+                        "Failed to create direct mappings for read/write operations (err = %d)\n",
+                        ret);
+                goto err_manuf_cleanup;
+        }
        /* After power up, all blocks are locked, so unlock them here. */
        for (i = 0; i < nand->memorg.ntargets; i++) {
                ret = spinand_select_target(spinand, i);
@@ -1037,6 +1037,7 @@ static int spinand_init(struct spinand_device *spinand)
        mtd->_block_markbad = spinand_mtd_block_markbad;
        mtd->_block_isreserved = spinand_mtd_block_isreserved;
        mtd->_erase = spinand_mtd_erase;
+        mtd->_max_bad_blocks = nanddev_mtd_max_bad_blocks;
        if (spinand->eccinfo.ooblayout)
                mtd_set_ooblayout(mtd, spinand->eccinfo.ooblayout);
diff --git a/drivers/mtd/nand/spi/gigadevice.c b/drivers/mtd/nand/spi/gigadevice.c
index 0b49d8264bef..e5586390026a 100644
--- a/drivers/mtd/nand/spi/gigadevice.c
+++ b/drivers/mtd/nand/spi/gigadevice.c
@@ -162,7 +162,7 @@ static const struct mtd_ooblayout_ops gd5fxgq4uexxg_ooblayout = {
 static const struct spinand_info gigadevice_spinand_table[] = {
        SPINAND_INFO("GD5F1GQ4xA", 0xF1,
-                     NAND_MEMORG(1, 2048, 64, 64, 1024, 1, 1, 1),
+                     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
@@ -171,7 +171,7 @@ static const struct spinand_info gigadevice_spinand_table[] = {
                     SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
                                     gd5fxgq4xa_ecc_get_status)),
        SPINAND_INFO("GD5F2GQ4xA", 0xF2,
-                     NAND_MEMORG(1, 2048, 64, 64, 2048, 1, 1, 1),
+                     NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
@@ -180,7 +180,7 @@ static const struct spinand_info gigadevice_spinand_table[] = {
                     SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
                                     gd5fxgq4xa_ecc_get_status)),
        SPINAND_INFO("GD5F4GQ4xA", 0xF4,
-                     NAND_MEMORG(1, 2048, 64, 64, 4096, 1, 1, 1),
+                     NAND_MEMORG(1, 2048, 64, 64, 4096, 40, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
@@ -189,7 +189,7 @@ static const struct spinand_info gigadevice_spinand_table[] = {
                     SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout,
                                     gd5fxgq4xa_ecc_get_status)),
        SPINAND_INFO("GD5F1GQ4UExxG", 0xd1,
-                     NAND_MEMORG(1, 2048, 128, 64, 1024, 1, 1, 1),
+                     NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
index d16b57081c95..6502727049a8 100644
--- a/drivers/mtd/nand/spi/macronix.c
+++ b/drivers/mtd/nand/spi/macronix.c
@@ -100,7 +100,7 @@ static int mx35lf1ge4ab_ecc_get_status(struct spinand_device *spinand,
 static const struct spinand_info macronix_spinand_table[] = {
        SPINAND_INFO("MX35LF1GE4AB", 0x12,
-                     NAND_MEMORG(1, 2048, 64, 64, 1024, 1, 1, 1),
+                     NAND_MEMORG(1, 2048, 64, 64, 1024, 40, 1, 1, 1),
                     NAND_ECCREQ(4, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
@@ -109,7 +109,7 @@ static const struct spinand_info macronix_spinand_table[] = {
                     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
                                     mx35lf1ge4ab_ecc_get_status)),
        SPINAND_INFO("MX35LF2GE4AB", 0x22,
-                     NAND_MEMORG(1, 2048, 64, 64, 2048, 2, 1, 1),
+                     NAND_MEMORG(1, 2048, 64, 64, 2048, 20, 2, 1, 1),
                     NAND_ECCREQ(4, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c
index 9c4381d6847b..7d7b1f7fcf71 100644
--- a/drivers/mtd/nand/spi/micron.c
+++ b/drivers/mtd/nand/spi/micron.c
@@ -92,7 +92,7 @@ static int mt29f2g01abagd_ecc_get_status(struct spinand_device *spinand,
 static const struct spinand_info micron_spinand_table[] = {
        SPINAND_INFO("MT29F2G01ABAGD", 0x24,
-                     NAND_MEMORG(1, 2048, 128, 64, 2048, 2, 1, 1),
+                     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 2, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
diff --git a/drivers/mtd/nand/spi/toshiba.c b/drivers/mtd/nand/spi/toshiba.c
index db8021da45b5..1cb3760ff779 100644
--- a/drivers/mtd/nand/spi/toshiba.c
+++ b/drivers/mtd/nand/spi/toshiba.c
@@ -96,7 +96,7 @@ static int tc58cxgxsx_ecc_get_status(struct spinand_device *spinand,
 static const struct spinand_info toshiba_spinand_table[] = {
        /* 3.3V 1Gb */
        SPINAND_INFO("TC58CVG0S3", 0xC2,
-                     NAND_MEMORG(1, 2048, 128, 64, 1024, 1, 1, 1),
+                     NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
@@ -106,7 +106,7 @@ static const struct spinand_info toshiba_spinand_table[] = {
                                     tc58cxgxsx_ecc_get_status)),
        /* 3.3V 2Gb */
        SPINAND_INFO("TC58CVG1S3", 0xCB,
-                     NAND_MEMORG(1, 2048, 128, 64, 2048, 1, 1, 1),
+                     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
@@ -116,7 +116,7 @@ static const struct spinand_info toshiba_spinand_table[] = {
                                     tc58cxgxsx_ecc_get_status)),
        /* 3.3V 4Gb */
        SPINAND_INFO("TC58CVG2S0", 0xCD,
-                     NAND_MEMORG(1, 4096, 256, 64, 2048, 1, 1, 1),
+                     NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
@@ -126,7 +126,7 @@ static const struct spinand_info toshiba_spinand_table[] = {
                                     tc58cxgxsx_ecc_get_status)),
        /* 1.8V 1Gb */
        SPINAND_INFO("TC58CYG0S3", 0xB2,
-                     NAND_MEMORG(1, 2048, 128, 64, 1024, 1, 1, 1),
+                     NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
@@ -136,7 +136,7 @@ static const struct spinand_info toshiba_spinand_table[] = {
                                     tc58cxgxsx_ecc_get_status)),
        /* 1.8V 2Gb */
        SPINAND_INFO("TC58CYG1S3", 0xBB,
-                     NAND_MEMORG(1, 2048, 128, 64, 2048, 1, 1, 1),
+                     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
@@ -146,7 +146,7 @@ static const struct spinand_info toshiba_spinand_table[] = {
                                     tc58cxgxsx_ecc_get_status)),
        /* 1.8V 4Gb */
        SPINAND_INFO("TC58CYG2S0", 0xBD,
-                     NAND_MEMORG(1, 4096, 256, 64, 2048, 1, 1, 1),
+                     NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c
index 5d944580b898..a6c17e0cace8 100644
--- a/drivers/mtd/nand/spi/winbond.c
+++ b/drivers/mtd/nand/spi/winbond.c
@@ -76,7 +76,7 @@ static int w25m02gv_select_target(struct spinand_device *spinand,
 static const struct spinand_info winbond_spinand_table[] = {
        SPINAND_INFO("W25M02GV", 0xAB,
-                     NAND_MEMORG(1, 2048, 64, 64, 1024, 1, 1, 2),
+                     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 2),
                     NAND_ECCREQ(1, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
@@ -85,7 +85,7 @@ static const struct spinand_info winbond_spinand_table[] = {
                     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL),
                     SPINAND_SELECT_TARGET(w25m02gv_select_target)),
        SPINAND_INFO("W25N01GV", 0xAA,
-                     NAND_MEMORG(1, 2048, 64, 64, 1024, 1, 1, 1),
+                     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
                     NAND_ECCREQ(1, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig
index fccf1950e92d..bc201327dda0 100644
--- a/drivers/mtd/parsers/Kconfig
+++ b/drivers/mtd/parsers/Kconfig
@@ -1,3 +1,30 @@
+config MTD_PARSER_IMAGETAG
+        tristate "Parser for BCM963XX Image Tag format partitions"
+        depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST
+        select CRC32
+        help
+          Image Tag is the firmware header used by broadcom on their xDSL line
+          of devices. It is used to describe the offsets and lengths of kernel
+          and rootfs partitions.
+          This driver adds support for parsing a partition with an Image Tag
+          header and creates up to two partitions, kernel and rootfs.
+config MTD_AFS_PARTS
+        tristate "ARM Firmware Suite partition parsing"
+        depends on (ARM || ARM64)
+        help
+          The ARM Firmware Suite allows the user to divide flash devices into
+          multiple 'images'. Each such image has a header containing its name
+          and offset/size etc.
+          If you need code which can detect and parse these tables, and
+          register MTD 'partitions' corresponding to each image detected,
+          enable this option.
+          You will still need the parsing functions to be called by the driver
+          for your particular device. It won't happen automatically. The
+          'physmap' map driver (CONFIG_MTD_PHYSMAP) does this, for example.
 config MTD_PARSER_TRX
        tristate "Parser for TRX format partitions"
        depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST)
diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile
index d8418bf6804a..cddc8f35a856 100644
--- a/drivers/mtd/parsers/Makefile
+++ b/drivers/mtd/parsers/Makefile
@@ -1,3 +1,5 @@
+obj-$(CONFIG_MTD_PARSER_IMAGETAG)       += parser_imagetag.o
+obj-$(CONFIG_MTD_AFS_PARTS)             += afs.o
 obj-$(CONFIG_MTD_PARSER_TRX)            += parser_trx.o
 obj-$(CONFIG_MTD_SHARPSL_PARTS)         += sharpslpart.o
 obj-$(CONFIG_MTD_REDBOOT_PARTS)         += redboot.o
diff --git a/drivers/mtd/parsers/afs.c b/drivers/mtd/parsers/afs.c
new file mode 100644
index 000000000000..0c730024f806
--- /dev/null
+++ b/drivers/mtd/parsers/afs.c
@@ -0,0 +1,410 @@
+/*======================================================================
+    drivers/mtd/afs.c: ARM Flash Layout/Partitioning
+    Copyright © 2000 ARM Limited
+    Copyright (C) 2019 Linus Walleij
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   This is access code for flashes using ARM's flash partitioning
+   standards.
+======================================================================*/
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/partitions.h>
+#define AFSV1_FOOTER_MAGIC 0xA0FFFF9F
+#define AFSV2_FOOTER_MAGIC1 0x464C5348 /* "FLSH" */
+#define AFSV2_FOOTER_MAGIC2 0x464F4F54 /* "FOOT" */
+struct footer_v1 {
+        u32 image_info_base;    /* Address of first word of ImageFooter  */
+        u32 image_start;        /* Start of area reserved by this footer */
+        u32 signature;          /* 'Magic' number proves it's a footer   */
+        u32 type;               /* Area type: ARM Image, SIB, customer   */
+        u32 checksum;           /* Just this structure                   */
+};
+struct image_info_v1 {
+        u32 bootFlags;          /* Boot flags, compression etc.          */
+        u32 imageNumber;        /* Unique number, selects for boot etc.  */
+        u32 loadAddress;        /* Address program should be loaded to   */
+        u32 length;             /* Actual size of image                  */
+        u32 address;            /* Image is executed from here           */
+        char name[16];          /* Null terminated                       */
+        u32 headerBase;         /* Flash Address of any stripped header  */
+        u32 header_length;      /* Length of header in memory            */
+        u32 headerType;         /* AIF, RLF, s-record etc.               */
+        u32 checksum;           /* Image checksum (inc. this struct)     */
+};
+static u32 word_sum(void *words, int num)
+{
+        u32 *p = words;
+        u32 sum = 0;
+        while (num--)
+                sum += *p++;
+        return sum;
+}
+static u32 word_sum_v2(u32 *p, u32 num)
+{
+        u32 sum = 0;
+        int i;
+        for (i = 0; i < num; i++) {
+                u32 val;
+                val = p[i];
+                if (val > ~sum)
+                        sum++;
+                sum += val;
+        }
+        return ~sum;
+}
+static bool afs_is_v1(struct mtd_info *mtd, u_int off)
+{
+        /* The magic is 12 bytes from the end of the erase block */
+        u_int ptr = off + mtd->erasesize - 12;
+        u32 magic;
+        size_t sz;
+        int ret;
+        ret = mtd_read(mtd, ptr, 4, &sz, (u_char *)&magic);
+        if (ret < 0) {
+                printk(KERN_ERR "AFS: mtd read failed at 0x%x: %d\n",
+                       ptr, ret);
+                return false;
+        }
+        if (ret >= 0 && sz != 4)
+                return false;
+        return (magic == AFSV1_FOOTER_MAGIC);
+}
+static bool afs_is_v2(struct mtd_info *mtd, u_int off)
+{
+        /* The magic is the 8 last bytes of the erase block */
+        u_int ptr = off + mtd->erasesize - 8;
+        u32 foot[2];
+        size_t sz;
+        int ret;
+        ret = mtd_read(mtd, ptr, 8, &sz, (u_char *)foot);
+        if (ret < 0) {
+                printk(KERN_ERR "AFS: mtd read failed at 0x%x: %d\n",
+                       ptr, ret);
+                return false;
+        }
+        if (ret >= 0 && sz != 8)
+                return false;
+        return (foot[0] == AFSV2_FOOTER_MAGIC1 &&
+                foot[1] == AFSV2_FOOTER_MAGIC2);
+}
+static int afs_parse_v1_partition(struct mtd_info *mtd,
+                                  u_int off, struct mtd_partition *part)
+{
+        struct footer_v1 fs;
+        struct image_info_v1 iis;
+        u_int mask;
+        /*
+         * Static checks cannot see that we bail out if we have an error
+         * reading the footer.
+         */
+        u_int uninitialized_var(iis_ptr);
+        u_int uninitialized_var(img_ptr);
+        u_int ptr;
+        size_t sz;
+        int ret;
+        int i;
+        /*
+         * This is the address mask; we use this to mask off out of
+         * range address bits.
+         */
+        mask = mtd->size - 1;
+        ptr = off + mtd->erasesize - sizeof(fs);
+        ret = mtd_read(mtd, ptr, sizeof(fs), &sz, (u_char *)&fs);
+        if (ret >= 0 && sz != sizeof(fs))
+                ret = -EINVAL;
+        if (ret < 0) {
+                printk(KERN_ERR "AFS: mtd read failed at 0x%x: %d\n",
+                       ptr, ret);
+                return ret;
+        }
+        /*
+         * Check the checksum.
+         */
+        if (word_sum(&fs, sizeof(fs) / sizeof(u32)) != 0xffffffff)
+                return -EINVAL;
+        /*
+         * Hide the SIB (System Information Block)
+         */
+        if (fs.type == 2)
+                return 0;
+        iis_ptr = fs.image_info_base & mask;
+        img_ptr = fs.image_start & mask;
+        /*
+         * Check the image info base.  This can not
+         * be located after the footer structure.
+         */
+        if (iis_ptr >= ptr)
+                return 0;
+        /*
+         * Check the start of this image.  The image
+         * data can not be located after this block.
+         */
+        if (img_ptr > off)
+                return 0;
+        /* Read the image info block */
+        memset(&iis, 0, sizeof(iis));
+        ret = mtd_read(mtd, iis_ptr, sizeof(iis), &sz, (u_char *)&iis);
+        if (ret < 0) {
+                printk(KERN_ERR "AFS: mtd read failed at 0x%x: %d\n",
+                       iis_ptr, ret);
+                return -EINVAL;
+        }
+        if (sz != sizeof(iis))
+                return -EINVAL;
+        /*
+         * Validate the name - it must be NUL terminated.
+         */
+        for (i = 0; i < sizeof(iis.name); i++)
+                if (iis.name[i] == '\0')
+                        break;
+        if (i > sizeof(iis.name))
+                return -EINVAL;
+        part->name = kstrdup(iis.name, GFP_KERNEL);
+        if (!part->name)
+                return -ENOMEM;
+        part->size = (iis.length + mtd->erasesize - 1) & ~(mtd->erasesize - 1);
+        part->offset = img_ptr;
+        part->mask_flags = 0;
+        printk("  mtd: at 0x%08x, %5lluKiB, %8u, %s\n",
+               img_ptr, part->size / 1024,
+               iis.imageNumber, part->name);
+        return 0;
+}
+static int afs_parse_v2_partition(struct mtd_info *mtd,
+                                  u_int off, struct mtd_partition *part)
+{
+        u_int ptr;
+        u32 footer[12];
+        u32 imginfo[36];
+        char *name;
+        u32 version;
+        u32 entrypoint;
+        u32 attributes;
+        u32 region_count;
+        u32 block_start;
+        u32 block_end;
+        u32 crc;
+        size_t sz;
+        int ret;
+        int i;
+        int pad = 0;
+        pr_debug("Parsing v2 partition @%08x-%08x\n",
+                 off, off + mtd->erasesize);
+        /* First read the footer */
+        ptr = off + mtd->erasesize - sizeof(footer);
+        ret = mtd_read(mtd, ptr, sizeof(footer), &sz, (u_char *)footer);
+        if ((ret < 0) || (ret >= 0 && sz != sizeof(footer))) {
+                pr_err("AFS: mtd read failed at 0x%x: %d\n",
+                       ptr, ret);
+                return -EIO;
+        }
+        name = (char *) &footer[0];
+        version = footer[9];
+        ptr = off + mtd->erasesize - sizeof(footer) - footer[8];
+        pr_debug("found image \"%s\", version %08x, info @%08x\n",
+                 name, version, ptr);
+        /* Then read the image information */
+        ret = mtd_read(mtd, ptr, sizeof(imginfo), &sz, (u_char *)imginfo);
+        if ((ret < 0) || (ret >= 0 && sz != sizeof(imginfo))) {
+                pr_err("AFS: mtd read failed at 0x%x: %d\n",
+                       ptr, ret);
+                return -EIO;
+        }
+        /* 32bit platforms have 4 bytes padding */
+        crc = word_sum_v2(&imginfo[1], 34);
+        if (!crc) {
+                pr_debug("Padding 1 word (4 bytes)\n");
+                pad = 1;
+        } else {
+                /* 64bit platforms have 8 bytes padding */
+                crc = word_sum_v2(&imginfo[2], 34);
+                if (!crc) {
+                        pr_debug("Padding 2 words (8 bytes)\n");
+                        pad = 2;
+                }
+        }
+        if (crc) {
+                pr_err("AFS: bad checksum on v2 image info: %08x\n", crc);
+                return -EINVAL;
+        }
+        entrypoint = imginfo[pad];
+        attributes = imginfo[pad+1];
+        region_count = imginfo[pad+2];
+        block_start = imginfo[20];
+        block_end = imginfo[21];
+        pr_debug("image entry=%08x, attr=%08x, regions=%08x, "
+                 "bs=%08x, be=%08x\n",
+                 entrypoint, attributes, region_count,
+                 block_start, block_end);
+        for (i = 0; i < region_count; i++) {
+                u32 region_load_addr = imginfo[pad + 3 + i*4];
+                u32 region_size = imginfo[pad + 4 + i*4];
+                u32 region_offset = imginfo[pad + 5 + i*4];
+                u32 region_start;
+                u32 region_end;
+                pr_debug("  region %d: address: %08x, size: %08x, "
+                         "offset: %08x\n",
+                         i,
+                         region_load_addr,
+                         region_size,
+                         region_offset);
+                region_start = off + region_offset;
+                region_end = region_start + region_size;
+                /* Align partition to end of erase block */
+                region_end += (mtd->erasesize - 1);
+                region_end &= ~(mtd->erasesize -1);
+                pr_debug("   partition start = %08x, partition end = %08x\n",
+                         region_start, region_end);
+                /* Create one partition per region */
+                part->name = kstrdup(name, GFP_KERNEL);
+                if (!part->name)
+                        return -ENOMEM;
+                part->offset = region_start;
+                part->size = region_end - region_start;
+                part->mask_flags = 0;
+        }
+        return 0;
+}
+static int parse_afs_partitions(struct mtd_info *mtd,
+                                const struct mtd_partition **pparts,
+                                struct mtd_part_parser_data *data)
+{
+        struct mtd_partition *parts;
+        u_int off, sz;
+        int ret = 0;
+        int i;
+        /* Count the partitions by looping over all erase blocks */
+        for (i = off = sz = 0; off < mtd->size; off += mtd->erasesize) {
+                if (afs_is_v1(mtd, off)) {
+                        sz += sizeof(struct mtd_partition);
+                        i += 1;
+                }
+                if (afs_is_v2(mtd, off)) {
+                        sz += sizeof(struct mtd_partition);
+                        i += 1;
+                }
+        }
+        if (!i)
+                return 0;
+        parts = kzalloc(sz, GFP_KERNEL);
+        if (!parts)
+                return -ENOMEM;
+        /*
+         * Identify the partitions
+         */
+        for (i = off = 0; off < mtd->size; off += mtd->erasesize) {
+                if (afs_is_v1(mtd, off)) {
+                        ret = afs_parse_v1_partition(mtd, off, &parts[i]);
+                        if (ret)
+                                goto out_free_parts;
+                        i++;
+                }
+                if (afs_is_v2(mtd, off)) {
+                        ret = afs_parse_v2_partition(mtd, off, &parts[i]);
+                        if (ret)
+                                goto out_free_parts;
+                        i++;
+                }
+        }
+        *pparts = parts;
+        return i;
+out_free_parts:
+        while (i >= 0) {
+                if (parts[i].name)
+                        kfree(parts[i].name);
+                i--;
+        }
+        kfree(parts);
+        *pparts = NULL;
+        return ret;
+}
+static const struct of_device_id mtd_parser_afs_of_match_table[] = {
+        { .compatible = "arm,arm-firmware-suite" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, mtd_parser_afs_of_match_table);
+static struct mtd_part_parser afs_parser = {
+        .parse_fn = parse_afs_partitions,
+        .name = "afs",
+        .of_match_table = mtd_parser_afs_of_match_table,
+};
+module_mtd_part_parser(afs_parser);
+MODULE_AUTHOR("ARM Ltd");
+MODULE_DESCRIPTION("ARM Firmware Suite partition parser");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/parsers/parser_imagetag.c b/drivers/mtd/parsers/parser_imagetag.c
new file mode 100644
index 000000000000..9537c183a3be
--- /dev/null
+++ b/drivers/mtd/parsers/parser_imagetag.c
@@ -0,0 +1,222 @@
+/*
+ * BCM63XX CFE image tag parser
+ *
+ * Copyright © 2006-2008  Florian Fainelli <florian@openwrt.org>
+ *                        Mike Albon <malbon@openwrt.org>
+ * Copyright © 2009-2010  Daniel Dickinson <openwrt@cshore.neomailbox.net>
+ * Copyright © 2011-2013  Jonas Gorski <jonas.gorski@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/bcm963xx_tag.h>
+#include <linux/crc32.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sizes.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/of.h>
+/* Ensure strings read from flash structs are null terminated */
+#define STR_NULL_TERMINATE(x) \
+        do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0)
+static int bcm963xx_read_imagetag(struct mtd_info *master, const char *name,
+        loff_t tag_offset, struct bcm_tag *buf)
+{
+        int ret;
+        size_t retlen;
+        u32 computed_crc;
+        ret = mtd_read(master, tag_offset, sizeof(*buf), &retlen, (void *)buf);
+        if (ret)
+                return ret;
+        if (retlen != sizeof(*buf))
+                return -EIO;
+        computed_crc = crc32_le(IMAGETAG_CRC_START, (u8 *)buf,
+                                offsetof(struct bcm_tag, header_crc));
+        if (computed_crc == buf->header_crc) {
+                STR_NULL_TERMINATE(buf->board_id);
+                STR_NULL_TERMINATE(buf->tag_version);
+                pr_info("%s: CFE image tag found at 0x%llx with version %s, board type %s\n",
+                        name, tag_offset, buf->tag_version, buf->board_id);
+                return 0;
+        }
+        pr_warn("%s: CFE image tag at 0x%llx CRC invalid (expected %08x, actual %08x)\n",
+                name, tag_offset, buf->header_crc, computed_crc);
+        return -EINVAL;
+}
+static int bcm963xx_parse_imagetag_partitions(struct mtd_info *master,
+                                        const struct mtd_partition **pparts,
+                                        struct mtd_part_parser_data *data)
+{
+        /* CFE, NVRAM and global Linux are always present */
+        int nrparts = 0, curpart = 0;
+        struct bcm_tag *buf = NULL;
+        struct mtd_partition *parts;
+        int ret;
+        unsigned int rootfsaddr, kerneladdr, spareaddr, offset;
+        unsigned int rootfslen, kernellen, sparelen, totallen;
+        int i;
+        bool rootfs_first = false;
+        buf = vmalloc(sizeof(struct bcm_tag));
+        if (!buf)
+                return -ENOMEM;
+        /* Get the tag */
+        ret = bcm963xx_read_imagetag(master, "rootfs", 0, buf);
+        if (!ret) {
+                STR_NULL_TERMINATE(buf->flash_image_start);
+                if (kstrtouint(buf->flash_image_start, 10, &rootfsaddr) ||
+                                rootfsaddr < BCM963XX_EXTENDED_SIZE) {
+                        pr_err("invalid rootfs address: %*ph\n",
+                                (int)sizeof(buf->flash_image_start),
+                                buf->flash_image_start);
+                        goto out;
+                }
+                STR_NULL_TERMINATE(buf->kernel_address);
+                if (kstrtouint(buf->kernel_address, 10, &kerneladdr) ||
+                                kerneladdr < BCM963XX_EXTENDED_SIZE) {
+                        pr_err("invalid kernel address: %*ph\n",
+                                (int)sizeof(buf->kernel_address),
+                                buf->kernel_address);
+                        goto out;
+                }
+                STR_NULL_TERMINATE(buf->kernel_length);
+                if (kstrtouint(buf->kernel_length, 10, &kernellen)) {
+                        pr_err("invalid kernel length: %*ph\n",
+                                (int)sizeof(buf->kernel_length),
+                                buf->kernel_length);
+                        goto out;
+                }
+                STR_NULL_TERMINATE(buf->total_length);
+                if (kstrtouint(buf->total_length, 10, &totallen)) {
+                        pr_err("invalid total length: %*ph\n",
+                                (int)sizeof(buf->total_length),
+                                buf->total_length);
+                        goto out;
+                }
+                /*
+                 * Addresses are flash absolute, so convert to partition
+                 * relative addresses. Assume either kernel or rootfs will
+                 * directly follow the image tag.
+                 */
+                if (rootfsaddr < kerneladdr)
+                        offset = rootfsaddr - sizeof(struct bcm_tag);
+                else
+                        offset = kerneladdr - sizeof(struct bcm_tag);
+                kerneladdr = kerneladdr - offset;
+                rootfsaddr = rootfsaddr - offset;
+                spareaddr = roundup(totallen, master->erasesize);
+                if (rootfsaddr < kerneladdr) {
+                        /* default Broadcom layout */
+                        rootfslen = kerneladdr - rootfsaddr;
+                        rootfs_first = true;
+                } else {
+                        /* OpenWrt layout */
+                        rootfsaddr = kerneladdr + kernellen;
+                        rootfslen = spareaddr - rootfsaddr;
+                }
+        } else {
+                goto out;
+        }
+        sparelen = master->size - spareaddr;
+        /* Determine number of partitions */
+        if (rootfslen > 0)
+                nrparts++;
+        if (kernellen > 0)
+                nrparts++;
+        parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
+        if (!parts) {
+                ret = -ENOMEM;
+                goto out;
+        }
+        /* Start building partition list */
+        if (kernellen > 0) {
+                int kernelpart = curpart;
+                if (rootfslen > 0 && rootfs_first)
+                        kernelpart++;
+                parts[kernelpart].name = "kernel";
+                parts[kernelpart].offset = kerneladdr;
+                parts[kernelpart].size = kernellen;
+                curpart++;
+        }
+        if (rootfslen > 0) {
+                int rootfspart = curpart;
+                if (kernellen > 0 && rootfs_first)
+                        rootfspart--;
+                parts[rootfspart].name = "rootfs";
+                parts[rootfspart].offset = rootfsaddr;
+                parts[rootfspart].size = rootfslen;
+                if (sparelen > 0  && !rootfs_first)
+                        parts[rootfspart].size += sparelen;
+                curpart++;
+        }
+        for (i = 0; i < nrparts; i++)
+                pr_info("Partition %d is %s offset %llx and length %llx\n", i,
+                        parts[i].name, parts[i].offset, parts[i].size);
+        pr_info("Spare partition is offset %x and length %x\n", spareaddr,
+                sparelen);
+        *pparts = parts;
+        ret = 0;
+out:
+        vfree(buf);
+        if (ret)
+                return ret;
+        return nrparts;
+}
+static const struct of_device_id parse_bcm963xx_imagetag_match_table[] = {
+        { .compatible = "brcm,bcm963xx-imagetag" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, parse_bcm963xx_imagetag_match_table);
+static struct mtd_part_parser bcm963xx_imagetag_parser = {
+        .parse_fn = bcm963xx_parse_imagetag_partitions,
+        .name = "bcm963xx-imagetag",
+        .of_match_table = parse_bcm963xx_imagetag_match_table,
+};
+module_mtd_part_parser(bcm963xx_imagetag_parser);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Daniel Dickinson <openwrt@cshore.neomailbox.net>");
+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
+MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");
+MODULE_AUTHOR("Jonas Gorski <jonas.gorski@gmail.com>");
+MODULE_DESCRIPTION("MTD parser for BCM963XX CFE Image Tag partitions");
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
index 89227b1d036a..e0955a98a0f4 100644
--- a/drivers/mtd/sm_ftl.c
+++ b/drivers/mtd/sm_ftl.c
@@ -222,17 +222,17 @@ static int sm_correct_sector(uint8_t *buffer, struct sm_oob *oob)
        uint8_t ecc[3];
        __nand_calculate_ecc(buffer, SM_SMALL_PAGE, ecc,
-                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
        if (__nand_correct_data(buffer, ecc, oob->ecc1, SM_SMALL_PAGE,
-                                IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC)) < 0)
+                                IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC)) < 0)
                return -EIO;
        buffer += SM_SMALL_PAGE;
        __nand_calculate_ecc(buffer, SM_SMALL_PAGE, ecc,
-                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
        if (__nand_correct_data(buffer, ecc, oob->ecc2, SM_SMALL_PAGE,
-                                IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC)) < 0)
+                                IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC)) < 0)
                return -EIO;
        return 0;
 }
@@ -399,11 +399,11 @@ restart:
                if (ftl->smallpagenand) {
                        __nand_calculate_ecc(buf + boffset, SM_SMALL_PAGE,
                                        oob.ecc1,
-                                        IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                                        IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
                        __nand_calculate_ecc(buf + boffset + SM_SMALL_PAGE,
                                        SM_SMALL_PAGE, oob.ecc2,
-                                        IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                                        IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
                }
                if (!sm_write_sector(ftl, zone, block, boffset,
                                                        buf + boffset, &oob))
diff --git a/drivers/mtd/spi-nor/intel-spi-pci.c b/drivers/mtd/spi-nor/intel-spi-pci.c
index 872b40922608..bfbfc17ed6aa 100644
--- a/drivers/mtd/spi-nor/intel-spi-pci.c
+++ b/drivers/mtd/spi-nor/intel-spi-pci.c
@@ -63,6 +63,7 @@ static void intel_spi_pci_remove(struct pci_dev *pdev)
 }
 static const struct pci_device_id intel_spi_pci_ids[] = {
+        { PCI_VDEVICE(INTEL, 0x02a4), (unsigned long)&bxt_info },
        { PCI_VDEVICE(INTEL, 0x18e0), (unsigned long)&bxt_info },
        { PCI_VDEVICE(INTEL, 0x19e0), (unsigned long)&bxt_info },
        { PCI_VDEVICE(INTEL, 0x34a4), (unsigned long)&bxt_info },
diff --git a/drivers/mtd/spi-nor/intel-spi.c b/drivers/mtd/spi-nor/intel-spi.c
index af0a22019516..d60cbf23d9aa 100644
--- a/drivers/mtd/spi-nor/intel-spi.c
+++ b/drivers/mtd/spi-nor/intel-spi.c
@@ -632,6 +632,10 @@ static ssize_t intel_spi_read(struct spi_nor *nor, loff_t from, size_t len,
        while (len > 0) {
                block_size = min_t(size_t, len, INTEL_SPI_FIFO_SZ);
+                /* Read cannot cross 4K boundary */
+                block_size = min_t(loff_t, from + block_size,
+                                   round_up(from + 1, SZ_4K)) - from;
                writel(from, ispi->base + FADDR);
                val = readl(ispi->base + HSFSTS_CTL);
@@ -685,6 +689,10 @@ static ssize_t intel_spi_write(struct spi_nor *nor, loff_t to, size_t len,
        while (len > 0) {
                block_size = min_t(size_t, len, INTEL_SPI_FIFO_SZ);
+                /* Write cannot cross 4K boundary */
+                block_size = min_t(loff_t, to + block_size,
+                                   round_up(to + 1, SZ_4K)) - to;
                writel(to, ispi->base + FADDR);
                val = readl(ispi->base + HSFSTS_CTL);
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index fae147452aff..73172d7f512b 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -744,7 +744,7 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map,
        u8 erase_mask = region->offset & SNOR_ERASE_TYPE_MASK;
        /*
-         * Erase types are ordered by size, with the biggest erase type at
+         * Erase types are ordered by size, with the smallest erase type at
         * index 0.
         */
        for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) {
@@ -1905,7 +1905,9 @@ static const struct flash_info spi_nor_ids[] = {
                        SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },
        { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, USE_CLSR) },
        { "s25fl256s1", INFO(0x010219, 0x4d01,  64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },
-        { "s25fl512s",  INFO6(0x010220, 0x4d0080, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },
+        { "s25fl512s",  INFO6(0x010220, 0x4d0080, 256 * 1024, 256,
+                        SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
+                        SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | USE_CLSR) },
        { "s25fs512s",  INFO6(0x010220, 0x4d0081, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },
        { "s70fl01gs",  INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) },
        { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024,  64, 0) },
@@ -2071,8 +2073,8 @@ static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
                                return &spi_nor_ids[tmp];
                }
        }
-        dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
+        dev_err(nor->dev, "unrecognized JEDEC id bytes: %*ph\n",
-                id[0], id[1], id[2]);
+                SPI_NOR_MAX_ID_LEN, id);
        return ERR_PTR(-ENODEV);
 }
diff --git a/drivers/mtd/tests/mtd_nandecctest.c b/drivers/mtd/tests/mtd_nandecctest.c
index c71523e94580..73b06304c975 100644
--- a/drivers/mtd/tests/mtd_nandecctest.c
+++ b/drivers/mtd/tests/mtd_nandecctest.c
@@ -21,7 +21,7 @@
 * or detected.
 */
-#if IS_ENABLED(CONFIG_MTD_NAND)
+#if IS_ENABLED(CONFIG_MTD_RAW_NAND)
 struct nand_ecc_test {
        const char *name;
@@ -122,9 +122,9 @@ static int no_bit_error_verify(void *error_data, void *error_ecc,
        int ret;
        __nand_calculate_ecc(error_data, size, calc_ecc,
-                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
        ret = __nand_correct_data(error_data, error_ecc, calc_ecc, size,
-                                  IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                                  IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
        if (ret == 0 && !memcmp(correct_data, error_data, size))
                return 0;
@@ -152,9 +152,9 @@ static int single_bit_error_correct(void *error_data, void *error_ecc,
        int ret;
        __nand_calculate_ecc(error_data, size, calc_ecc,
-                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
        ret = __nand_correct_data(error_data, error_ecc, calc_ecc, size,
-                                  IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                                  IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
        if (ret == 1 && !memcmp(correct_data, error_data, size))
                return 0;
@@ -189,9 +189,9 @@ static int double_bit_error_detect(void *error_data, void *error_ecc,
        int ret;
        __nand_calculate_ecc(error_data, size, calc_ecc,
-                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
        ret = __nand_correct_data(error_data, error_ecc, calc_ecc, size,
-                                  IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                                  IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
        return (ret == -EBADMSG) ? 0 : -EINVAL;
 }
@@ -266,7 +266,7 @@ static int nand_ecc_test_run(const size_t size)
        prandom_bytes(correct_data, size);
        __nand_calculate_ecc(correct_data, size, correct_ecc,
-                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SMC));
+                             IS_ENABLED(CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC));
        for (i = 0; i < ARRAY_SIZE(nand_ecc_test); i++) {
                nand_ecc_test[i].prepare(error_data, error_ecc,