mtd: rawnand: Move drivers for Ingenic SoCs to subfolder
authorPaul Cercueil <paul@crapouillou.net>
Tue, 19 Mar 2019 14:53:54 +0000 (15:53 +0100)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Thu, 21 Mar 2019 15:56:18 +0000 (16:56 +0100)
Before adding support for more SoCs and seeing the number of files for
these drivers grow, we move them to their own subfolder to keep it tidy.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
12 files changed:
drivers/mtd/nand/raw/Kconfig
drivers/mtd/nand/raw/Makefile
drivers/mtd/nand/raw/ingenic/Kconfig [new file with mode: 0644]
drivers/mtd/nand/raw/ingenic/Makefile [new file with mode: 0644]
drivers/mtd/nand/raw/ingenic/jz4740_nand.c [new file with mode: 0644]
drivers/mtd/nand/raw/ingenic/jz4780_bch.c [new file with mode: 0644]
drivers/mtd/nand/raw/ingenic/jz4780_bch.h [new file with mode: 0644]
drivers/mtd/nand/raw/ingenic/jz4780_nand.c [new file with mode: 0644]
drivers/mtd/nand/raw/jz4740_nand.c [deleted file]
drivers/mtd/nand/raw/jz4780_bch.c [deleted file]
drivers/mtd/nand/raw/jz4780_bch.h [deleted file]
drivers/mtd/nand/raw/jz4780_nand.c [deleted file]

index e604625e2dfa402c783d14266e8a201de81ee7d2..705863c6709a4fe9799bc162eaacba49aa5470f4 100644 (file)
@@ -470,19 +470,7 @@ config MTD_NAND_NUC900
          This enables the driver for the NAND Flash on evaluation board based
          on w90p910 / NUC9xx.
 
-config MTD_NAND_JZ4740
-       tristate "Support for JZ4740 SoC NAND controller"
-       depends on MACH_JZ4740 || 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.
+source "drivers/mtd/nand/raw/ingenic/Kconfig"
 
 config MTD_NAND_FSMC
        tristate "Support for NAND on ST Micros FSMC"
index 5a5a72f0793eb2765fe954ea3c7d1e85bb444c0f..5552c4a9f2cfc1938213a3193fe9f4a2353045ef 100644 (file)
@@ -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-$(CONFIG_MTD_NAND_JZ4780)          += jz4780_nand.o jz4780_bch.o
+obj-y                                  += ingenic/
 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/ingenic/Kconfig b/drivers/mtd/nand/raw/ingenic/Kconfig
new file mode 100644 (file)
index 0000000..67806c8
--- /dev/null
@@ -0,0 +1,13 @@
+config MTD_NAND_JZ4740
+       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.
diff --git a/drivers/mtd/nand/raw/ingenic/Makefile b/drivers/mtd/nand/raw/ingenic/Makefile
new file mode 100644 (file)
index 0000000..44c2ca0
--- /dev/null
@@ -0,0 +1,2 @@
+obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o
+obj-$(CONFIG_MTD_NAND_JZ4780) += jz4780_nand.o jz4780_bch.o
diff --git a/drivers/mtd/nand/raw/ingenic/jz4740_nand.c b/drivers/mtd/nand/raw/ingenic/jz4740_nand.c
new file mode 100644 (file)
index 0000000..9526d5b
--- /dev/null
@@ -0,0 +1,542 @@
+/*
+ *  Copyright (C) 2009-2010, Lars-Peter Clausen <lars@metafoo.de>
+ *  JZ4740 SoC NAND controller driver
+ *
+ *  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.
+ *
+ *  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.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/module.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/gpio/consumer.h>
+
+#include <linux/platform_data/jz4740/jz4740_nand.h>
+
+#define JZ_REG_NAND_CTRL       0x50
+#define JZ_REG_NAND_ECC_CTRL   0x100
+#define JZ_REG_NAND_DATA       0x104
+#define JZ_REG_NAND_PAR0       0x108
+#define JZ_REG_NAND_PAR1       0x10C
+#define JZ_REG_NAND_PAR2       0x110
+#define JZ_REG_NAND_IRQ_STAT   0x114
+#define JZ_REG_NAND_IRQ_CTRL   0x118
+#define JZ_REG_NAND_ERR(x)     (0x11C + ((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)
+
+#define JZ_NAND_CTRL_ENABLE_CHIP(x) BIT((x) << 1)
+#define JZ_NAND_CTRL_ASSERT_CHIP(x) BIT(((x) << 1) + 1)
+#define JZ_NAND_CTRL_ASSERT_CHIP_MASK 0xaa
+
+#define JZ_NAND_MEM_CMD_OFFSET 0x08000
+#define JZ_NAND_MEM_ADDR_OFFSET 0x10000
+
+struct jz_nand {
+       struct nand_chip chip;
+       void __iomem *base;
+       struct resource *mem;
+
+       unsigned char banks[JZ_NAND_NUM_BANKS];
+       void __iomem *bank_base[JZ_NAND_NUM_BANKS];
+       struct resource *bank_mem[JZ_NAND_NUM_BANKS];
+
+       int selected_bank;
+
+       struct gpio_desc *busy_gpio;
+       bool is_reading;
+};
+
+static inline struct jz_nand *mtd_to_jz_nand(struct mtd_info *mtd)
+{
+       return container_of(mtd_to_nand(mtd), struct jz_nand, chip);
+}
+
+static void jz_nand_select_chip(struct nand_chip *chip, int chipnr)
+{
+       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
+       uint32_t ctrl;
+       int banknr;
+
+       ctrl = readl(nand->base + JZ_REG_NAND_CTRL);
+       ctrl &= ~JZ_NAND_CTRL_ASSERT_CHIP_MASK;
+
+       if (chipnr == -1) {
+               banknr = -1;
+       } else {
+               banknr = nand->banks[chipnr] - 1;
+               chip->legacy.IO_ADDR_R = nand->bank_base[banknr];
+               chip->legacy.IO_ADDR_W = nand->bank_base[banknr];
+       }
+       writel(ctrl, nand->base + JZ_REG_NAND_CTRL);
+
+       nand->selected_bank = banknr;
+}
+
+static void jz_nand_cmd_ctrl(struct nand_chip *chip, int dat,
+                            unsigned int ctrl)
+{
+       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
+       uint32_t reg;
+       void __iomem *bank_base = nand->bank_base[nand->selected_bank];
+
+       BUG_ON(nand->selected_bank < 0);
+
+       if (ctrl & NAND_CTRL_CHANGE) {
+               BUG_ON((ctrl & NAND_ALE) && (ctrl & NAND_CLE));
+               if (ctrl & NAND_ALE)
+                       bank_base += JZ_NAND_MEM_ADDR_OFFSET;
+               else if (ctrl & NAND_CLE)
+                       bank_base += JZ_NAND_MEM_CMD_OFFSET;
+               chip->legacy.IO_ADDR_W = bank_base;
+
+               reg = readl(nand->base + JZ_REG_NAND_CTRL);
+               if (ctrl & NAND_NCE)
+                       reg |= JZ_NAND_CTRL_ASSERT_CHIP(nand->selected_bank);
+               else
+                       reg &= ~JZ_NAND_CTRL_ASSERT_CHIP(nand->selected_bank);
+               writel(reg, nand->base + JZ_REG_NAND_CTRL);
+       }
+       if (dat != NAND_CMD_NONE)
+               writeb(dat, chip->legacy.IO_ADDR_W);
+}
+
+static int jz_nand_dev_ready(struct nand_chip *chip)
+{
+       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
+       return gpiod_get_value_cansleep(nand->busy_gpio);
+}
+
+static void jz_nand_hwctl(struct nand_chip *chip, int mode)
+{
+       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
+       uint32_t reg;
+
+       writel(0, nand->base + JZ_REG_NAND_IRQ_STAT);
+       reg = readl(nand->base + JZ_REG_NAND_ECC_CTRL);
+
+       reg |= JZ_NAND_ECC_CTRL_RESET;
+       reg |= JZ_NAND_ECC_CTRL_ENABLE;
+       reg |= JZ_NAND_ECC_CTRL_RS;
+
+       switch (mode) {
+       case NAND_ECC_READ:
+               reg &= ~JZ_NAND_ECC_CTRL_ENCODING;
+               nand->is_reading = true;
+               break;
+       case NAND_ECC_WRITE:
+               reg |= JZ_NAND_ECC_CTRL_ENCODING;
+               nand->is_reading = false;
+               break;
+       default:
+               break;
+       }
+
+       writel(reg, nand->base + JZ_REG_NAND_ECC_CTRL);
+}
+
+static int jz_nand_calculate_ecc_rs(struct nand_chip *chip, const uint8_t *dat,
+                                   uint8_t *ecc_code)
+{
+       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
+       uint32_t reg, status;
+       int i;
+       unsigned int timeout = 1000;
+       static uint8_t empty_block_ecc[] = {0xcd, 0x9d, 0x90, 0x58, 0xf4,
+                                               0x8b, 0xff, 0xb7, 0x6f};
+
+       if (nand->is_reading)
+               return 0;
+
+       do {
+               status = readl(nand->base + JZ_REG_NAND_IRQ_STAT);
+       } while (!(status & JZ_NAND_STATUS_ENC_FINISH) && --timeout);
+
+       if (timeout == 0)
+           return -1;
+
+       reg = readl(nand->base + JZ_REG_NAND_ECC_CTRL);
+       reg &= ~JZ_NAND_ECC_CTRL_ENABLE;
+       writel(reg, nand->base + JZ_REG_NAND_ECC_CTRL);
+
+       for (i = 0; i < 9; ++i)
+               ecc_code[i] = readb(nand->base + JZ_REG_NAND_PAR0 + i);
+
+       /* If the written data is completly 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, 9) == 0)
+               memset(ecc_code, 0xff, 9);
+
+       return 0;
+}
+
+static void jz_nand_correct_data(uint8_t *dat, int index, int mask)
+{
+       int offset = index & 0x7;
+       uint16_t data;
+
+       index += (index >> 3);
+
+       data = dat[index];
+       data |= dat[index+1] << 8;
+
+       mask ^= (data >> offset) & 0x1ff;
+       data &= ~(0x1ff << offset);
+       data |= (mask << offset);
+
+       dat[index] = data & 0xff;
+       dat[index+1] = (data >> 8) & 0xff;
+}
+
+static int jz_nand_correct_ecc_rs(struct nand_chip *chip, uint8_t *dat,
+                                 uint8_t *read_ecc, uint8_t *calc_ecc)
+{
+       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
+       int i, error_count, index;
+       uint32_t reg, status, error;
+       unsigned int timeout = 1000;
+
+       for (i = 0; i < 9; ++i)
+               writeb(read_ecc[i], nand->base + JZ_REG_NAND_PAR0 + i);
+
+       reg = readl(nand->base + JZ_REG_NAND_ECC_CTRL);
+       reg |= JZ_NAND_ECC_CTRL_PAR_READY;
+       writel(reg, nand->base + JZ_REG_NAND_ECC_CTRL);
+
+       do {
+               status = readl(nand->base + JZ_REG_NAND_IRQ_STAT);
+       } while (!(status & JZ_NAND_STATUS_DEC_FINISH) && --timeout);
+
+       if (timeout == 0)
+               return -ETIMEDOUT;
+
+       reg = readl(nand->base + JZ_REG_NAND_ECC_CTRL);
+       reg &= ~JZ_NAND_ECC_CTRL_ENABLE;
+       writel(reg, nand->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(nand->base + JZ_REG_NAND_ERR(i));
+                       index = ((error >> 16) & 0x1ff) - 1;
+                       if (index >= 0 && index < 512)
+                               jz_nand_correct_data(dat, index, error & 0x1ff);
+               }
+
+               return error_count;
+       }
+
+       return 0;
+}
+
+static int jz_nand_ioremap_resource(struct platform_device *pdev,
+       const char *name, struct resource **res, void __iomem **base)
+{
+       int ret;
+
+       *res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
+       if (!*res) {
+               dev_err(&pdev->dev, "Failed to get platform %s memory\n", name);
+               ret = -ENXIO;
+               goto err;
+       }
+
+       *res = request_mem_region((*res)->start, resource_size(*res),
+                               pdev->name);
+       if (!*res) {
+               dev_err(&pdev->dev, "Failed to request %s memory region\n", name);
+               ret = -EBUSY;
+               goto err;
+       }
+
+       *base = ioremap((*res)->start, resource_size(*res));
+       if (!*base) {
+               dev_err(&pdev->dev, "Failed to ioremap %s memory region\n", name);
+               ret = -EBUSY;
+               goto err_release_mem;
+       }
+
+       return 0;
+
+err_release_mem:
+       release_mem_region((*res)->start, resource_size(*res));
+err:
+       *res = NULL;
+       *base = NULL;
+       return ret;
+}
+
+static inline void jz_nand_iounmap_resource(struct resource *res,
+                                           void __iomem *base)
+{
+       iounmap(base);
+       release_mem_region(res->start, resource_size(res));
+}
+
+static int jz_nand_detect_bank(struct platform_device *pdev,
+                              struct jz_nand *nand, unsigned char bank,
+                              size_t chipnr, uint8_t *nand_maf_id,
+                              uint8_t *nand_dev_id)
+{
+       int ret;
+       char res_name[6];
+       uint32_t ctrl;
+       struct nand_chip *chip = &nand->chip;
+       struct mtd_info *mtd = nand_to_mtd(chip);
+       u8 id[2];
+
+       /* Request I/O resource. */
+       sprintf(res_name, "bank%d", bank);
+       ret = jz_nand_ioremap_resource(pdev, res_name,
+                                       &nand->bank_mem[bank - 1],
+                                       &nand->bank_base[bank - 1]);
+       if (ret)
+               return ret;
+
+       /* Enable chip in bank. */
+       ctrl = readl(nand->base + JZ_REG_NAND_CTRL);
+       ctrl |= JZ_NAND_CTRL_ENABLE_CHIP(bank - 1);
+       writel(ctrl, nand->base + JZ_REG_NAND_CTRL);
+
+       if (chipnr == 0) {
+               /* Detect first chip. */
+               ret = nand_scan(chip, 1);
+               if (ret)
+                       goto notfound_id;
+
+               /* Retrieve the IDs from the first chip. */
+               nand_select_target(chip, 0);
+               nand_reset_op(chip);
+               nand_readid_op(chip, 0, id, sizeof(id));
+               *nand_maf_id = id[0];
+               *nand_dev_id = id[1];
+       } else {
+               /* Detect additional chip. */
+               nand_select_target(chip, chipnr);
+               nand_reset_op(chip);
+               nand_readid_op(chip, 0, id, sizeof(id));
+               if (*nand_maf_id != id[0] || *nand_dev_id != id[1]) {
+                       ret = -ENODEV;
+                       goto notfound_id;
+               }
+
+               /* Update size of the MTD. */
+               chip->numchips++;
+               mtd->size += chip->chipsize;
+       }
+
+       dev_info(&pdev->dev, "Found chip %zu on bank %i\n", chipnr, bank);
+       return 0;
+
+notfound_id:
+       dev_info(&pdev->dev, "No chip found on bank %i\n", bank);
+       ctrl &= ~(JZ_NAND_CTRL_ENABLE_CHIP(bank - 1));
+       writel(ctrl, nand->base + JZ_REG_NAND_CTRL);
+       jz_nand_iounmap_resource(nand->bank_mem[bank - 1],
+                                nand->bank_base[bank - 1]);
+       return ret;
+}
+
+static int jz_nand_attach_chip(struct nand_chip *chip)
+{
+       struct mtd_info *mtd = nand_to_mtd(chip);
+       struct device *dev = mtd->dev.parent;
+       struct jz_nand_platform_data *pdata = dev_get_platdata(dev);
+       struct platform_device *pdev = to_platform_device(dev);
+
+       if (pdata && pdata->ident_callback)
+               pdata->ident_callback(pdev, mtd, &pdata->partitions,
+                                     &pdata->num_partitions);
+
+       return 0;
+}
+
+static const struct nand_controller_ops jz_nand_controller_ops = {
+       .attach_chip = jz_nand_attach_chip,
+};
+
+static int jz_nand_probe(struct platform_device *pdev)
+{
+       int ret;
+       struct jz_nand *nand;
+       struct nand_chip *chip;
+       struct mtd_info *mtd;
+       struct jz_nand_platform_data *pdata = dev_get_platdata(&pdev->dev);
+       size_t chipnr, bank_idx;
+       uint8_t nand_maf_id = 0, nand_dev_id = 0;
+
+       nand = kzalloc(sizeof(*nand), GFP_KERNEL);
+       if (!nand)
+               return -ENOMEM;
+
+       ret = jz_nand_ioremap_resource(pdev, "mmio", &nand->mem, &nand->base);
+       if (ret)
+               goto err_free;
+
+       nand->busy_gpio = devm_gpiod_get_optional(&pdev->dev, "busy", GPIOD_IN);
+       if (IS_ERR(nand->busy_gpio)) {
+               ret = PTR_ERR(nand->busy_gpio);
+               dev_err(&pdev->dev, "Failed to request busy gpio %d\n",
+                   ret);
+               goto err_iounmap_mmio;
+       }
+
+       chip            = &nand->chip;
+       mtd             = nand_to_mtd(chip);
+       mtd->dev.parent = &pdev->dev;
+       mtd->name       = "jz4740-nand";
+
+       chip->ecc.hwctl         = jz_nand_hwctl;
+       chip->ecc.calculate     = jz_nand_calculate_ecc_rs;
+       chip->ecc.correct       = jz_nand_correct_ecc_rs;
+       chip->ecc.mode          = NAND_ECC_HW_OOB_FIRST;
+       chip->ecc.size          = 512;
+       chip->ecc.bytes         = 9;
+       chip->ecc.strength      = 4;
+       chip->ecc.options       = NAND_ECC_GENERIC_ERASED_CHECK;
+
+       chip->legacy.chip_delay = 50;
+       chip->legacy.cmd_ctrl = jz_nand_cmd_ctrl;
+       chip->legacy.select_chip = jz_nand_select_chip;
+       chip->legacy.dummy_controller.ops = &jz_nand_controller_ops;
+
+       if (nand->busy_gpio)
+               chip->legacy.dev_ready = jz_nand_dev_ready;
+
+       platform_set_drvdata(pdev, nand);
+
+       /* We are going to autodetect NAND chips in the banks specified in the
+        * platform data. Although nand_scan_ident() can detect multiple chips,
+        * it requires those chips to be numbered consecuitively, which is not
+        * always the case for external memory banks. And a fixed chip-to-bank
+        * mapping is not practical either, since for example Dingoo units
+        * produced at different times have NAND chips in different banks.
+        */
+       chipnr = 0;
+       for (bank_idx = 0; bank_idx < JZ_NAND_NUM_BANKS; bank_idx++) {
+               unsigned char bank;
+
+               /* If there is no platform data, look for NAND in bank 1,
+                * which is the most likely bank since it is the only one
+                * that can be booted from.
+                */
+               bank = pdata ? pdata->banks[bank_idx] : bank_idx ^ 1;
+               if (bank == 0)
+                       break;
+               if (bank > JZ_NAND_NUM_BANKS) {
+                       dev_warn(&pdev->dev,
+                               "Skipping non-existing bank: %d\n", bank);
+                       continue;
+               }
+               /* The detection routine will directly or indirectly call
+                * jz_nand_select_chip(), so nand->banks has to contain the
+                * bank we're checking.
+                */
+               nand->banks[chipnr] = bank;
+               if (jz_nand_detect_bank(pdev, nand, bank, chipnr,
+                                       &nand_maf_id, &nand_dev_id) == 0)
+                       chipnr++;
+               else
+                       nand->banks[chipnr] = 0;
+       }
+       if (chipnr == 0) {
+               dev_err(&pdev->dev, "No NAND chips found\n");
+               goto err_iounmap_mmio;
+       }
+
+       ret = mtd_device_register(mtd, pdata ? pdata->partitions : NULL,
+                                 pdata ? pdata->num_partitions : 0);
+
+       if (ret) {
+               dev_err(&pdev->dev, "Failed to add mtd device\n");
+               goto err_cleanup_nand;
+       }
+
+       dev_info(&pdev->dev, "Successfully registered JZ4740 NAND driver\n");
+
+       return 0;
+
+err_cleanup_nand:
+       nand_cleanup(chip);
+       while (chipnr--) {
+               unsigned char bank = nand->banks[chipnr];
+               jz_nand_iounmap_resource(nand->bank_mem[bank - 1],
+                                        nand->bank_base[bank - 1]);
+       }
+       writel(0, nand->base + JZ_REG_NAND_CTRL);
+err_iounmap_mmio:
+       jz_nand_iounmap_resource(nand->mem, nand->base);
+err_free:
+       kfree(nand);
+       return ret;
+}
+
+static int jz_nand_remove(struct platform_device *pdev)
+{
+       struct jz_nand *nand = platform_get_drvdata(pdev);
+       size_t i;
+
+       nand_release(&nand->chip);
+
+       /* Deassert and disable all chips */
+       writel(0, nand->base + JZ_REG_NAND_CTRL);
+
+       for (i = 0; i < JZ_NAND_NUM_BANKS; ++i) {
+               unsigned char bank = nand->banks[i];
+               if (bank != 0) {
+                       jz_nand_iounmap_resource(nand->bank_mem[bank - 1],
+                                                nand->bank_base[bank - 1]);
+               }
+       }
+
+       jz_nand_iounmap_resource(nand->mem, nand->base);
+
+       kfree(nand);
+
+       return 0;
+}
+
+static struct platform_driver jz_nand_driver = {
+       .probe = jz_nand_probe,
+       .remove = jz_nand_remove,
+       .driver = {
+               .name = "jz4740-nand",
+       },
+};
+
+module_platform_driver(jz_nand_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("NAND controller driver for JZ4740 SoC");
+MODULE_ALIAS("platform:jz4740-nand");
diff --git a/drivers/mtd/nand/raw/ingenic/jz4780_bch.c b/drivers/mtd/nand/raw/ingenic/jz4780_bch.c
new file mode 100644 (file)
index 0000000..c5f74ed
--- /dev/null
@@ -0,0 +1,385 @@
+/*
+ * 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.
+ */
+
+#include <linux/bitops.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/init.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"
+
+#define BCH_BHCR                       0x0
+#define BCH_BHCCR                      0x8
+#define BCH_BHCNT                      0xc
+#define BCH_BHDR                       0x10
+#define BCH_BHPAR0                     0x14
+#define BCH_BHERR0                     0x84
+#define BCH_BHINT                      0x184
+#define BCH_BHINTES                    0x188
+#define BCH_BHINTEC                    0x18c
+#define BCH_BHINTE                     0x190
+
+#define BCH_BHCR_BSEL_SHIFT            4
+#define BCH_BHCR_BSEL_MASK             (0x7f << BCH_BHCR_BSEL_SHIFT)
+#define BCH_BHCR_ENCE                  BIT(2)
+#define BCH_BHCR_INIT                  BIT(1)
+#define BCH_BHCR_BCHE                  BIT(0)
+
+#define BCH_BHCNT_PARITYSIZE_SHIFT     16
+#define BCH_BHCNT_PARITYSIZE_MASK      (0x7f << BCH_BHCNT_PARITYSIZE_SHIFT)
+#define BCH_BHCNT_BLOCKSIZE_SHIFT      0
+#define BCH_BHCNT_BLOCKSIZE_MASK       (0x7ff << BCH_BHCNT_BLOCKSIZE_SHIFT)
+
+#define BCH_BHERR_MASK_SHIFT           16
+#define BCH_BHERR_MASK_MASK            (0xffff << BCH_BHERR_MASK_SHIFT)
+#define BCH_BHERR_INDEX_SHIFT          0
+#define BCH_BHERR_INDEX_MASK           (0x7ff << BCH_BHERR_INDEX_SHIFT)
+
+#define BCH_BHINT_ERRC_SHIFT           24
+#define BCH_BHINT_ERRC_MASK            (0x7f << BCH_BHINT_ERRC_SHIFT)
+#define BCH_BHINT_TERRC_SHIFT          16
+#define BCH_BHINT_TERRC_MASK           (0x7f << BCH_BHINT_TERRC_SHIFT)
+#define BCH_BHINT_DECF                 BIT(3)
+#define BCH_BHINT_ENCF                 BIT(2)
+#define BCH_BHINT_UNCOR                        BIT(1)
+#define BCH_BHINT_ERR                  BIT(0)
+
+#define BCH_CLK_RATE                   (200 * 1000 * 1000)
+
+/* Timeout for BCH calculation/correction. */
+#define BCH_TIMEOUT_US                 100000
+
+struct jz4780_bch {
+       struct device *dev;
+       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;
+
+       /* Clear interrupt status. */
+       writel(readl(bch->base + BCH_BHINT), bch->base + BCH_BHINT);
+
+       /* Set up BCH count register. */
+       reg = params->size << BCH_BHCNT_BLOCKSIZE_SHIFT;
+       reg |= params->bytes << BCH_BHCNT_PARITYSIZE_SHIFT;
+       writel(reg, bch->base + BCH_BHCNT);
+
+       /* Initialise and enable BCH. */
+       reg = BCH_BHCR_BCHE | BCH_BHCR_INIT;
+       reg |= params->strength << BCH_BHCR_BSEL_SHIFT;
+       if (encode)
+               reg |= BCH_BHCR_ENCE;
+       writel(reg, bch->base + BCH_BHCR);
+}
+
+static void jz4780_bch_disable(struct jz4780_bch *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,
+                                 size_t size)
+{
+       size_t size32 = size / sizeof(u32);
+       size_t size8 = size % sizeof(u32);
+       const u32 *src32;
+       const u8 *src8;
+
+       src32 = (const u32 *)buf;
+       while (size32--)
+               writel(*src32++, bch->base + BCH_BHDR);
+
+       src8 = (const u8 *)src32;
+       while (size8--)
+               writeb(*src8++, bch->base + BCH_BHDR);
+}
+
+static void jz4780_bch_read_parity(struct jz4780_bch *bch, void *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(bch->base + BCH_BHPAR0 + offset);
+               offset += sizeof(u32);
+       }
+
+       dest8 = (u8 *)dest32;
+       val = readl(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 bool jz4780_bch_wait_complete(struct jz4780_bch *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_poll_timeout(bch->base + BCH_BHINT, reg,
+                                (reg & irq) == irq, 0, BCH_TIMEOUT_US);
+       if (ret)
+               return false;
+
+       if (status)
+               *status = reg;
+
+       writel(reg, bch->base + BCH_BHINT);
+       return true;
+}
+
+/**
+ * jz4780_bch_calculate() - calculate ECC for a data buffer
+ * @bch: BCH device.
+ * @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_write_data(bch, buf, params->size);
+
+       if (jz4780_bch_wait_complete(bch, BCH_BHINT_ENCF, NULL)) {
+               jz4780_bch_read_parity(bch, ecc_code, params->bytes);
+       } else {
+               dev_err(bch->dev, "timed out while calculating ECC\n");
+               ret = -ETIMEDOUT;
+       }
+
+       jz4780_bch_disable(bch);
+       mutex_unlock(&bch->lock);
+       return ret;
+}
+EXPORT_SYMBOL(jz4780_bch_calculate);
+
+/**
+ * jz4780_bch_correct() - detect and correct bit errors
+ * @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_write_data(bch, buf, params->size);
+       jz4780_bch_write_data(bch, ecc_code, params->bytes);
+
+       if (!jz4780_bch_wait_complete(bch, BCH_BHINT_DECF, &reg)) {
+               dev_err(bch->dev, "timed out while correcting data\n");
+               ret = -ETIMEDOUT;
+               goto out;
+       }
+
+       if (reg & BCH_BHINT_UNCOR) {
+               dev_warn(bch->dev, "uncorrectable ECC error\n");
+               ret = -EBADMSG;
+               goto out;
+       }
+
+       /* Correct any detected errors. */
+       if (reg & BCH_BHINT_ERR) {
+               count = (reg & BCH_BHINT_ERRC_MASK) >> BCH_BHINT_ERRC_SHIFT;
+               ret = (reg & BCH_BHINT_TERRC_MASK) >> BCH_BHINT_TERRC_SHIFT;
+
+               for (i = 0; i < count; i++) {
+                       reg = readl(bch->base + BCH_BHERR0 + (i * 4));
+                       mask = (reg & BCH_BHERR_MASK_MASK) >>
+                                               BCH_BHERR_MASK_SHIFT;
+                       index = (reg & BCH_BHERR_INDEX_MASK) >>
+                                               BCH_BHERR_INDEX_SHIFT;
+                       buf[(index * 2) + 0] ^= mask;
+                       buf[(index * 2) + 1] ^= mask >> 8;
+               }
+       } else {
+               ret = 0;
+       }
+
+out:
+       jz4780_bch_disable(bch);
+       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 jz4780_bch *bch;
+       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);
+       if (IS_ERR(bch->clk)) {
+               dev_err(dev, "failed to get clock: %ld\n", PTR_ERR(bch->clk));
+               return PTR_ERR(bch->clk);
+       }
+
+       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 of_device_id jz4780_bch_dt_match[] = {
+       { .compatible = "ingenic,jz4780-bch" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, jz4780_bch_dt_match);
+
+static struct platform_driver jz4780_bch_driver = {
+       .probe          = jz4780_bch_probe,
+       .driver = {
+               .name   = "jz4780-bch",
+               .of_match_table = of_match_ptr(jz4780_bch_dt_match),
+       },
+};
+module_platform_driver(jz4780_bch_driver);
+
+MODULE_AUTHOR("Alex Smith <alex@alex-smith.me.uk>");
+MODULE_AUTHOR("Harvey Hunt <harveyhuntnexus@gmail.com>");
+MODULE_DESCRIPTION("Ingenic JZ4780 BCH error correction driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mtd/nand/raw/ingenic/jz4780_bch.h b/drivers/mtd/nand/raw/ingenic/jz4780_bch.h
new file mode 100644 (file)
index 0000000..bf47180
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * 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/ingenic/jz4780_nand.c b/drivers/mtd/nand/raw/ingenic/jz4780_nand.c
new file mode 100644 (file)
index 0000000..22e5897
--- /dev/null
@@ -0,0 +1,415 @@
+/*
+ * 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/jz4740_nand.c b/drivers/mtd/nand/raw/jz4740_nand.c
deleted file mode 100644 (file)
index 9526d5b..0000000
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
- *  Copyright (C) 2009-2010, Lars-Peter Clausen <lars@metafoo.de>
- *  JZ4740 SoC NAND controller driver
- *
- *  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.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <linux/kernel.h>
-#include <linux/module.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/gpio/consumer.h>
-
-#include <linux/platform_data/jz4740/jz4740_nand.h>
-
-#define JZ_REG_NAND_CTRL       0x50
-#define JZ_REG_NAND_ECC_CTRL   0x100
-#define JZ_REG_NAND_DATA       0x104
-#define JZ_REG_NAND_PAR0       0x108
-#define JZ_REG_NAND_PAR1       0x10C
-#define JZ_REG_NAND_PAR2       0x110
-#define JZ_REG_NAND_IRQ_STAT   0x114
-#define JZ_REG_NAND_IRQ_CTRL   0x118
-#define JZ_REG_NAND_ERR(x)     (0x11C + ((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)
-
-#define JZ_NAND_CTRL_ENABLE_CHIP(x) BIT((x) << 1)
-#define JZ_NAND_CTRL_ASSERT_CHIP(x) BIT(((x) << 1) + 1)
-#define JZ_NAND_CTRL_ASSERT_CHIP_MASK 0xaa
-
-#define JZ_NAND_MEM_CMD_OFFSET 0x08000
-#define JZ_NAND_MEM_ADDR_OFFSET 0x10000
-
-struct jz_nand {
-       struct nand_chip chip;
-       void __iomem *base;
-       struct resource *mem;
-
-       unsigned char banks[JZ_NAND_NUM_BANKS];
-       void __iomem *bank_base[JZ_NAND_NUM_BANKS];
-       struct resource *bank_mem[JZ_NAND_NUM_BANKS];
-
-       int selected_bank;
-
-       struct gpio_desc *busy_gpio;
-       bool is_reading;
-};
-
-static inline struct jz_nand *mtd_to_jz_nand(struct mtd_info *mtd)
-{
-       return container_of(mtd_to_nand(mtd), struct jz_nand, chip);
-}
-
-static void jz_nand_select_chip(struct nand_chip *chip, int chipnr)
-{
-       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
-       uint32_t ctrl;
-       int banknr;
-
-       ctrl = readl(nand->base + JZ_REG_NAND_CTRL);
-       ctrl &= ~JZ_NAND_CTRL_ASSERT_CHIP_MASK;
-
-       if (chipnr == -1) {
-               banknr = -1;
-       } else {
-               banknr = nand->banks[chipnr] - 1;
-               chip->legacy.IO_ADDR_R = nand->bank_base[banknr];
-               chip->legacy.IO_ADDR_W = nand->bank_base[banknr];
-       }
-       writel(ctrl, nand->base + JZ_REG_NAND_CTRL);
-
-       nand->selected_bank = banknr;
-}
-
-static void jz_nand_cmd_ctrl(struct nand_chip *chip, int dat,
-                            unsigned int ctrl)
-{
-       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
-       uint32_t reg;
-       void __iomem *bank_base = nand->bank_base[nand->selected_bank];
-
-       BUG_ON(nand->selected_bank < 0);
-
-       if (ctrl & NAND_CTRL_CHANGE) {
-               BUG_ON((ctrl & NAND_ALE) && (ctrl & NAND_CLE));
-               if (ctrl & NAND_ALE)
-                       bank_base += JZ_NAND_MEM_ADDR_OFFSET;
-               else if (ctrl & NAND_CLE)
-                       bank_base += JZ_NAND_MEM_CMD_OFFSET;
-               chip->legacy.IO_ADDR_W = bank_base;
-
-               reg = readl(nand->base + JZ_REG_NAND_CTRL);
-               if (ctrl & NAND_NCE)
-                       reg |= JZ_NAND_CTRL_ASSERT_CHIP(nand->selected_bank);
-               else
-                       reg &= ~JZ_NAND_CTRL_ASSERT_CHIP(nand->selected_bank);
-               writel(reg, nand->base + JZ_REG_NAND_CTRL);
-       }
-       if (dat != NAND_CMD_NONE)
-               writeb(dat, chip->legacy.IO_ADDR_W);
-}
-
-static int jz_nand_dev_ready(struct nand_chip *chip)
-{
-       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
-       return gpiod_get_value_cansleep(nand->busy_gpio);
-}
-
-static void jz_nand_hwctl(struct nand_chip *chip, int mode)
-{
-       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
-       uint32_t reg;
-
-       writel(0, nand->base + JZ_REG_NAND_IRQ_STAT);
-       reg = readl(nand->base + JZ_REG_NAND_ECC_CTRL);
-
-       reg |= JZ_NAND_ECC_CTRL_RESET;
-       reg |= JZ_NAND_ECC_CTRL_ENABLE;
-       reg |= JZ_NAND_ECC_CTRL_RS;
-
-       switch (mode) {
-       case NAND_ECC_READ:
-               reg &= ~JZ_NAND_ECC_CTRL_ENCODING;
-               nand->is_reading = true;
-               break;
-       case NAND_ECC_WRITE:
-               reg |= JZ_NAND_ECC_CTRL_ENCODING;
-               nand->is_reading = false;
-               break;
-       default:
-               break;
-       }
-
-       writel(reg, nand->base + JZ_REG_NAND_ECC_CTRL);
-}
-
-static int jz_nand_calculate_ecc_rs(struct nand_chip *chip, const uint8_t *dat,
-                                   uint8_t *ecc_code)
-{
-       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
-       uint32_t reg, status;
-       int i;
-       unsigned int timeout = 1000;
-       static uint8_t empty_block_ecc[] = {0xcd, 0x9d, 0x90, 0x58, 0xf4,
-                                               0x8b, 0xff, 0xb7, 0x6f};
-
-       if (nand->is_reading)
-               return 0;
-
-       do {
-               status = readl(nand->base + JZ_REG_NAND_IRQ_STAT);
-       } while (!(status & JZ_NAND_STATUS_ENC_FINISH) && --timeout);
-
-       if (timeout == 0)
-           return -1;
-
-       reg = readl(nand->base + JZ_REG_NAND_ECC_CTRL);
-       reg &= ~JZ_NAND_ECC_CTRL_ENABLE;
-       writel(reg, nand->base + JZ_REG_NAND_ECC_CTRL);
-
-       for (i = 0; i < 9; ++i)
-               ecc_code[i] = readb(nand->base + JZ_REG_NAND_PAR0 + i);
-
-       /* If the written data is completly 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, 9) == 0)
-               memset(ecc_code, 0xff, 9);
-
-       return 0;
-}
-
-static void jz_nand_correct_data(uint8_t *dat, int index, int mask)
-{
-       int offset = index & 0x7;
-       uint16_t data;
-
-       index += (index >> 3);
-
-       data = dat[index];
-       data |= dat[index+1] << 8;
-
-       mask ^= (data >> offset) & 0x1ff;
-       data &= ~(0x1ff << offset);
-       data |= (mask << offset);
-
-       dat[index] = data & 0xff;
-       dat[index+1] = (data >> 8) & 0xff;
-}
-
-static int jz_nand_correct_ecc_rs(struct nand_chip *chip, uint8_t *dat,
-                                 uint8_t *read_ecc, uint8_t *calc_ecc)
-{
-       struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
-       int i, error_count, index;
-       uint32_t reg, status, error;
-       unsigned int timeout = 1000;
-
-       for (i = 0; i < 9; ++i)
-               writeb(read_ecc[i], nand->base + JZ_REG_NAND_PAR0 + i);
-
-       reg = readl(nand->base + JZ_REG_NAND_ECC_CTRL);
-       reg |= JZ_NAND_ECC_CTRL_PAR_READY;
-       writel(reg, nand->base + JZ_REG_NAND_ECC_CTRL);
-
-       do {
-               status = readl(nand->base + JZ_REG_NAND_IRQ_STAT);
-       } while (!(status & JZ_NAND_STATUS_DEC_FINISH) && --timeout);
-
-       if (timeout == 0)
-               return -ETIMEDOUT;
-
-       reg = readl(nand->base + JZ_REG_NAND_ECC_CTRL);
-       reg &= ~JZ_NAND_ECC_CTRL_ENABLE;
-       writel(reg, nand->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(nand->base + JZ_REG_NAND_ERR(i));
-                       index = ((error >> 16) & 0x1ff) - 1;
-                       if (index >= 0 && index < 512)
-                               jz_nand_correct_data(dat, index, error & 0x1ff);
-               }
-
-               return error_count;
-       }
-
-       return 0;
-}
-
-static int jz_nand_ioremap_resource(struct platform_device *pdev,
-       const char *name, struct resource **res, void __iomem **base)
-{
-       int ret;
-
-       *res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
-       if (!*res) {
-               dev_err(&pdev->dev, "Failed to get platform %s memory\n", name);
-               ret = -ENXIO;
-               goto err;
-       }
-
-       *res = request_mem_region((*res)->start, resource_size(*res),
-                               pdev->name);
-       if (!*res) {
-               dev_err(&pdev->dev, "Failed to request %s memory region\n", name);
-               ret = -EBUSY;
-               goto err;
-       }
-
-       *base = ioremap((*res)->start, resource_size(*res));
-       if (!*base) {
-               dev_err(&pdev->dev, "Failed to ioremap %s memory region\n", name);
-               ret = -EBUSY;
-               goto err_release_mem;
-       }
-
-       return 0;
-
-err_release_mem:
-       release_mem_region((*res)->start, resource_size(*res));
-err:
-       *res = NULL;
-       *base = NULL;
-       return ret;
-}
-
-static inline void jz_nand_iounmap_resource(struct resource *res,
-                                           void __iomem *base)
-{
-       iounmap(base);
-       release_mem_region(res->start, resource_size(res));
-}
-
-static int jz_nand_detect_bank(struct platform_device *pdev,
-                              struct jz_nand *nand, unsigned char bank,
-                              size_t chipnr, uint8_t *nand_maf_id,
-                              uint8_t *nand_dev_id)
-{
-       int ret;
-       char res_name[6];
-       uint32_t ctrl;
-       struct nand_chip *chip = &nand->chip;
-       struct mtd_info *mtd = nand_to_mtd(chip);
-       u8 id[2];
-
-       /* Request I/O resource. */
-       sprintf(res_name, "bank%d", bank);
-       ret = jz_nand_ioremap_resource(pdev, res_name,
-                                       &nand->bank_mem[bank - 1],
-                                       &nand->bank_base[bank - 1]);
-       if (ret)
-               return ret;
-
-       /* Enable chip in bank. */
-       ctrl = readl(nand->base + JZ_REG_NAND_CTRL);
-       ctrl |= JZ_NAND_CTRL_ENABLE_CHIP(bank - 1);
-       writel(ctrl, nand->base + JZ_REG_NAND_CTRL);
-
-       if (chipnr == 0) {
-               /* Detect first chip. */
-               ret = nand_scan(chip, 1);
-               if (ret)
-                       goto notfound_id;
-
-               /* Retrieve the IDs from the first chip. */
-               nand_select_target(chip, 0);
-               nand_reset_op(chip);
-               nand_readid_op(chip, 0, id, sizeof(id));
-               *nand_maf_id = id[0];
-               *nand_dev_id = id[1];
-       } else {
-               /* Detect additional chip. */
-               nand_select_target(chip, chipnr);
-               nand_reset_op(chip);
-               nand_readid_op(chip, 0, id, sizeof(id));
-               if (*nand_maf_id != id[0] || *nand_dev_id != id[1]) {
-                       ret = -ENODEV;
-                       goto notfound_id;
-               }
-
-               /* Update size of the MTD. */
-               chip->numchips++;
-               mtd->size += chip->chipsize;
-       }
-
-       dev_info(&pdev->dev, "Found chip %zu on bank %i\n", chipnr, bank);
-       return 0;
-
-notfound_id:
-       dev_info(&pdev->dev, "No chip found on bank %i\n", bank);
-       ctrl &= ~(JZ_NAND_CTRL_ENABLE_CHIP(bank - 1));
-       writel(ctrl, nand->base + JZ_REG_NAND_CTRL);
-       jz_nand_iounmap_resource(nand->bank_mem[bank - 1],
-                                nand->bank_base[bank - 1]);
-       return ret;
-}
-
-static int jz_nand_attach_chip(struct nand_chip *chip)
-{
-       struct mtd_info *mtd = nand_to_mtd(chip);
-       struct device *dev = mtd->dev.parent;
-       struct jz_nand_platform_data *pdata = dev_get_platdata(dev);
-       struct platform_device *pdev = to_platform_device(dev);
-
-       if (pdata && pdata->ident_callback)
-               pdata->ident_callback(pdev, mtd, &pdata->partitions,
-                                     &pdata->num_partitions);
-
-       return 0;
-}
-
-static const struct nand_controller_ops jz_nand_controller_ops = {
-       .attach_chip = jz_nand_attach_chip,
-};
-
-static int jz_nand_probe(struct platform_device *pdev)
-{
-       int ret;
-       struct jz_nand *nand;
-       struct nand_chip *chip;
-       struct mtd_info *mtd;
-       struct jz_nand_platform_data *pdata = dev_get_platdata(&pdev->dev);
-       size_t chipnr, bank_idx;
-       uint8_t nand_maf_id = 0, nand_dev_id = 0;
-
-       nand = kzalloc(sizeof(*nand), GFP_KERNEL);
-       if (!nand)
-               return -ENOMEM;
-
-       ret = jz_nand_ioremap_resource(pdev, "mmio", &nand->mem, &nand->base);
-       if (ret)
-               goto err_free;
-
-       nand->busy_gpio = devm_gpiod_get_optional(&pdev->dev, "busy", GPIOD_IN);
-       if (IS_ERR(nand->busy_gpio)) {
-               ret = PTR_ERR(nand->busy_gpio);
-               dev_err(&pdev->dev, "Failed to request busy gpio %d\n",
-                   ret);
-               goto err_iounmap_mmio;
-       }
-
-       chip            = &nand->chip;
-       mtd             = nand_to_mtd(chip);
-       mtd->dev.parent = &pdev->dev;
-       mtd->name       = "jz4740-nand";
-
-       chip->ecc.hwctl         = jz_nand_hwctl;
-       chip->ecc.calculate     = jz_nand_calculate_ecc_rs;
-       chip->ecc.correct       = jz_nand_correct_ecc_rs;
-       chip->ecc.mode          = NAND_ECC_HW_OOB_FIRST;
-       chip->ecc.size          = 512;
-       chip->ecc.bytes         = 9;
-       chip->ecc.strength      = 4;
-       chip->ecc.options       = NAND_ECC_GENERIC_ERASED_CHECK;
-
-       chip->legacy.chip_delay = 50;
-       chip->legacy.cmd_ctrl = jz_nand_cmd_ctrl;
-       chip->legacy.select_chip = jz_nand_select_chip;
-       chip->legacy.dummy_controller.ops = &jz_nand_controller_ops;
-
-       if (nand->busy_gpio)
-               chip->legacy.dev_ready = jz_nand_dev_ready;
-
-       platform_set_drvdata(pdev, nand);
-
-       /* We are going to autodetect NAND chips in the banks specified in the
-        * platform data. Although nand_scan_ident() can detect multiple chips,
-        * it requires those chips to be numbered consecuitively, which is not
-        * always the case for external memory banks. And a fixed chip-to-bank
-        * mapping is not practical either, since for example Dingoo units
-        * produced at different times have NAND chips in different banks.
-        */
-       chipnr = 0;
-       for (bank_idx = 0; bank_idx < JZ_NAND_NUM_BANKS; bank_idx++) {
-               unsigned char bank;
-
-               /* If there is no platform data, look for NAND in bank 1,
-                * which is the most likely bank since it is the only one
-                * that can be booted from.
-                */
-               bank = pdata ? pdata->banks[bank_idx] : bank_idx ^ 1;
-               if (bank == 0)
-                       break;
-               if (bank > JZ_NAND_NUM_BANKS) {
-                       dev_warn(&pdev->dev,
-                               "Skipping non-existing bank: %d\n", bank);
-                       continue;
-               }
-               /* The detection routine will directly or indirectly call
-                * jz_nand_select_chip(), so nand->banks has to contain the
-                * bank we're checking.
-                */
-               nand->banks[chipnr] = bank;
-               if (jz_nand_detect_bank(pdev, nand, bank, chipnr,
-                                       &nand_maf_id, &nand_dev_id) == 0)
-                       chipnr++;
-               else
-                       nand->banks[chipnr] = 0;
-       }
-       if (chipnr == 0) {
-               dev_err(&pdev->dev, "No NAND chips found\n");
-               goto err_iounmap_mmio;
-       }
-
-       ret = mtd_device_register(mtd, pdata ? pdata->partitions : NULL,
-                                 pdata ? pdata->num_partitions : 0);
-
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to add mtd device\n");
-               goto err_cleanup_nand;
-       }
-
-       dev_info(&pdev->dev, "Successfully registered JZ4740 NAND driver\n");
-
-       return 0;
-
-err_cleanup_nand:
-       nand_cleanup(chip);
-       while (chipnr--) {
-               unsigned char bank = nand->banks[chipnr];
-               jz_nand_iounmap_resource(nand->bank_mem[bank - 1],
-                                        nand->bank_base[bank - 1]);
-       }
-       writel(0, nand->base + JZ_REG_NAND_CTRL);
-err_iounmap_mmio:
-       jz_nand_iounmap_resource(nand->mem, nand->base);
-err_free:
-       kfree(nand);
-       return ret;
-}
-
-static int jz_nand_remove(struct platform_device *pdev)
-{
-       struct jz_nand *nand = platform_get_drvdata(pdev);
-       size_t i;
-
-       nand_release(&nand->chip);
-
-       /* Deassert and disable all chips */
-       writel(0, nand->base + JZ_REG_NAND_CTRL);
-
-       for (i = 0; i < JZ_NAND_NUM_BANKS; ++i) {
-               unsigned char bank = nand->banks[i];
-               if (bank != 0) {
-                       jz_nand_iounmap_resource(nand->bank_mem[bank - 1],
-                                                nand->bank_base[bank - 1]);
-               }
-       }
-
-       jz_nand_iounmap_resource(nand->mem, nand->base);
-
-       kfree(nand);
-
-       return 0;
-}
-
-static struct platform_driver jz_nand_driver = {
-       .probe = jz_nand_probe,
-       .remove = jz_nand_remove,
-       .driver = {
-               .name = "jz4740-nand",
-       },
-};
-
-module_platform_driver(jz_nand_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
-MODULE_DESCRIPTION("NAND controller driver for JZ4740 SoC");
-MODULE_ALIAS("platform:jz4740-nand");
diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/jz4780_bch.c
deleted file mode 100644 (file)
index c5f74ed..0000000
+++ /dev/null
@@ -1,385 +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.
- */
-
-#include <linux/bitops.h>
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/init.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"
-
-#define BCH_BHCR                       0x0
-#define BCH_BHCCR                      0x8
-#define BCH_BHCNT                      0xc
-#define BCH_BHDR                       0x10
-#define BCH_BHPAR0                     0x14
-#define BCH_BHERR0                     0x84
-#define BCH_BHINT                      0x184
-#define BCH_BHINTES                    0x188
-#define BCH_BHINTEC                    0x18c
-#define BCH_BHINTE                     0x190
-
-#define BCH_BHCR_BSEL_SHIFT            4
-#define BCH_BHCR_BSEL_MASK             (0x7f << BCH_BHCR_BSEL_SHIFT)
-#define BCH_BHCR_ENCE                  BIT(2)
-#define BCH_BHCR_INIT                  BIT(1)
-#define BCH_BHCR_BCHE                  BIT(0)
-
-#define BCH_BHCNT_PARITYSIZE_SHIFT     16
-#define BCH_BHCNT_PARITYSIZE_MASK      (0x7f << BCH_BHCNT_PARITYSIZE_SHIFT)
-#define BCH_BHCNT_BLOCKSIZE_SHIFT      0
-#define BCH_BHCNT_BLOCKSIZE_MASK       (0x7ff << BCH_BHCNT_BLOCKSIZE_SHIFT)
-
-#define BCH_BHERR_MASK_SHIFT           16
-#define BCH_BHERR_MASK_MASK            (0xffff << BCH_BHERR_MASK_SHIFT)
-#define BCH_BHERR_INDEX_SHIFT          0
-#define BCH_BHERR_INDEX_MASK           (0x7ff << BCH_BHERR_INDEX_SHIFT)
-
-#define BCH_BHINT_ERRC_SHIFT           24
-#define BCH_BHINT_ERRC_MASK            (0x7f << BCH_BHINT_ERRC_SHIFT)
-#define BCH_BHINT_TERRC_SHIFT          16
-#define BCH_BHINT_TERRC_MASK           (0x7f << BCH_BHINT_TERRC_SHIFT)
-#define BCH_BHINT_DECF                 BIT(3)
-#define BCH_BHINT_ENCF                 BIT(2)
-#define BCH_BHINT_UNCOR                        BIT(1)
-#define BCH_BHINT_ERR                  BIT(0)
-
-#define BCH_CLK_RATE                   (200 * 1000 * 1000)
-
-/* Timeout for BCH calculation/correction. */
-#define BCH_TIMEOUT_US                 100000
-
-struct jz4780_bch {
-       struct device *dev;
-       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;
-
-       /* Clear interrupt status. */
-       writel(readl(bch->base + BCH_BHINT), bch->base + BCH_BHINT);
-
-       /* Set up BCH count register. */
-       reg = params->size << BCH_BHCNT_BLOCKSIZE_SHIFT;
-       reg |= params->bytes << BCH_BHCNT_PARITYSIZE_SHIFT;
-       writel(reg, bch->base + BCH_BHCNT);
-
-       /* Initialise and enable BCH. */
-       reg = BCH_BHCR_BCHE | BCH_BHCR_INIT;
-       reg |= params->strength << BCH_BHCR_BSEL_SHIFT;
-       if (encode)
-               reg |= BCH_BHCR_ENCE;
-       writel(reg, bch->base + BCH_BHCR);
-}
-
-static void jz4780_bch_disable(struct jz4780_bch *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,
-                                 size_t size)
-{
-       size_t size32 = size / sizeof(u32);
-       size_t size8 = size % sizeof(u32);
-       const u32 *src32;
-       const u8 *src8;
-
-       src32 = (const u32 *)buf;
-       while (size32--)
-               writel(*src32++, bch->base + BCH_BHDR);
-
-       src8 = (const u8 *)src32;
-       while (size8--)
-               writeb(*src8++, bch->base + BCH_BHDR);
-}
-
-static void jz4780_bch_read_parity(struct jz4780_bch *bch, void *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(bch->base + BCH_BHPAR0 + offset);
-               offset += sizeof(u32);
-       }
-
-       dest8 = (u8 *)dest32;
-       val = readl(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 bool jz4780_bch_wait_complete(struct jz4780_bch *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_poll_timeout(bch->base + BCH_BHINT, reg,
-                                (reg & irq) == irq, 0, BCH_TIMEOUT_US);
-       if (ret)
-               return false;
-
-       if (status)
-               *status = reg;
-
-       writel(reg, bch->base + BCH_BHINT);
-       return true;
-}
-
-/**
- * jz4780_bch_calculate() - calculate ECC for a data buffer
- * @bch: BCH device.
- * @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_write_data(bch, buf, params->size);
-
-       if (jz4780_bch_wait_complete(bch, BCH_BHINT_ENCF, NULL)) {
-               jz4780_bch_read_parity(bch, ecc_code, params->bytes);
-       } else {
-               dev_err(bch->dev, "timed out while calculating ECC\n");
-               ret = -ETIMEDOUT;
-       }
-
-       jz4780_bch_disable(bch);
-       mutex_unlock(&bch->lock);
-       return ret;
-}
-EXPORT_SYMBOL(jz4780_bch_calculate);
-
-/**
- * jz4780_bch_correct() - detect and correct bit errors
- * @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_write_data(bch, buf, params->size);
-       jz4780_bch_write_data(bch, ecc_code, params->bytes);
-
-       if (!jz4780_bch_wait_complete(bch, BCH_BHINT_DECF, &reg)) {
-               dev_err(bch->dev, "timed out while correcting data\n");
-               ret = -ETIMEDOUT;
-               goto out;
-       }
-
-       if (reg & BCH_BHINT_UNCOR) {
-               dev_warn(bch->dev, "uncorrectable ECC error\n");
-               ret = -EBADMSG;
-               goto out;
-       }
-
-       /* Correct any detected errors. */
-       if (reg & BCH_BHINT_ERR) {
-               count = (reg & BCH_BHINT_ERRC_MASK) >> BCH_BHINT_ERRC_SHIFT;
-               ret = (reg & BCH_BHINT_TERRC_MASK) >> BCH_BHINT_TERRC_SHIFT;
-
-               for (i = 0; i < count; i++) {
-                       reg = readl(bch->base + BCH_BHERR0 + (i * 4));
-                       mask = (reg & BCH_BHERR_MASK_MASK) >>
-                                               BCH_BHERR_MASK_SHIFT;
-                       index = (reg & BCH_BHERR_INDEX_MASK) >>
-                                               BCH_BHERR_INDEX_SHIFT;
-                       buf[(index * 2) + 0] ^= mask;
-                       buf[(index * 2) + 1] ^= mask >> 8;
-               }
-       } else {
-               ret = 0;
-       }
-
-out:
-       jz4780_bch_disable(bch);
-       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 jz4780_bch *bch;
-       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);
-       if (IS_ERR(bch->clk)) {
-               dev_err(dev, "failed to get clock: %ld\n", PTR_ERR(bch->clk));
-               return PTR_ERR(bch->clk);
-       }
-
-       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 of_device_id jz4780_bch_dt_match[] = {
-       { .compatible = "ingenic,jz4780-bch" },
-       {},
-};
-MODULE_DEVICE_TABLE(of, jz4780_bch_dt_match);
-
-static struct platform_driver jz4780_bch_driver = {
-       .probe          = jz4780_bch_probe,
-       .driver = {
-               .name   = "jz4780-bch",
-               .of_match_table = of_match_ptr(jz4780_bch_dt_match),
-       },
-};
-module_platform_driver(jz4780_bch_driver);
-
-MODULE_AUTHOR("Alex Smith <alex@alex-smith.me.uk>");
-MODULE_AUTHOR("Harvey Hunt <harveyhuntnexus@gmail.com>");
-MODULE_DESCRIPTION("Ingenic JZ4780 BCH error correction driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/mtd/nand/raw/jz4780_bch.h b/drivers/mtd/nand/raw/jz4780_bch.h
deleted file mode 100644 (file)
index bf47180..0000000
+++ /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 (file)
index 22e5897..0000000
+++ /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");