mtd: rawnand: fsl_upm: Get rid of the legacy interface implementation

Now that the driver implements exec_op(), we can get rid of the legacy
interface implementation.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200603134922.1352340-10-boris.brezillon@collabora.com

diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c
index 03ca209..197850a 100644 (file)
--- a/drivers/mtd/nand/raw/fsl_upm.c
+++ b/drivers/mtd/nand/raw/fsl_upm.c
@@ -19,15 +19,10 @@
 #include <linux/slab.h>
 #include <asm/fsl_lbc.h>
 
-#define FSL_UPM_WAIT_RUN_PATTERN  0x1
-#define FSL_UPM_WAIT_WRITE_BYTE   0x2
-#define FSL_UPM_WAIT_WRITE_BUFFER 0x4
-
 struct fsl_upm_nand {
        struct nand_controller base;
        struct device *dev;
        struct nand_chip chip;
-       int last_ctrl;
        struct fsl_upm upm;
        uint8_t upm_addr_offset;
        uint8_t upm_cmd_offset;
@@ -36,8 +31,6 @@ struct fsl_upm_nand {
        uint32_t mchip_offsets[NAND_MAX_CHIPS];
        uint32_t mchip_count;
        uint32_t mchip_number;
-       int chip_delay;
-       uint32_t wait_flags;
 };
 
 static inline struct fsl_upm_nand *to_fsl_upm_nand(struct mtd_info *mtdinfo)
@@ -46,105 +39,6 @@ static inline struct fsl_upm_nand *to_fsl_upm_nand(struct mtd_info *mtdinfo)
                            chip);
 }
 
-static int fun_chip_ready(struct nand_chip *chip)
-{
-       struct fsl_upm_nand *fun = to_fsl_upm_nand(nand_to_mtd(chip));
-
-       if (gpiod_get_value(fun->rnb_gpio[fun->mchip_number]))
-               return 1;
-
-       dev_vdbg(fun->dev, "busy\n");
-       return 0;
-}
-
-static void fun_wait_rnb(struct fsl_upm_nand *fun)
-{
-       if (fun->rnb_gpio[fun->mchip_number] >= 0) {
-               int cnt = 1000000;
-
-               while (--cnt && !fun_chip_ready(&fun->chip))
-                       cpu_relax();
-               if (!cnt)
-                       dev_err(fun->dev, "tired waiting for RNB\n");
-       } else {
-               ndelay(100);
-       }
-}
-
-static void fun_cmd_ctrl(struct nand_chip *chip, int cmd, unsigned int ctrl)
-{
-       struct fsl_upm_nand *fun = to_fsl_upm_nand(nand_to_mtd(chip));
-       u32 mar;
-
-       if (!(ctrl & fun->last_ctrl)) {
-               fsl_upm_end_pattern(&fun->upm);
-
-               if (cmd == NAND_CMD_NONE)
-                       return;
-
-               fun->last_ctrl = ctrl & (NAND_ALE | NAND_CLE);
-       }
-
-       if (ctrl & NAND_CTRL_CHANGE) {
-               if (ctrl & NAND_ALE)
-                       fsl_upm_start_pattern(&fun->upm, fun->upm_addr_offset);
-               else if (ctrl & NAND_CLE)
-                       fsl_upm_start_pattern(&fun->upm, fun->upm_cmd_offset);
-       }
-
-       mar = (cmd << (32 - fun->upm.width)) |
-               fun->mchip_offsets[fun->mchip_number];
-       fsl_upm_run_pattern(&fun->upm, chip->legacy.IO_ADDR_R, mar);
-
-       if (fun->wait_flags & FSL_UPM_WAIT_RUN_PATTERN)
-               fun_wait_rnb(fun);
-}
-
-static void fun_select_chip(struct nand_chip *chip, int mchip_nr)
-{
-       struct fsl_upm_nand *fun = to_fsl_upm_nand(nand_to_mtd(chip));
-
-       if (mchip_nr == -1) {
-               chip->legacy.cmd_ctrl(chip, NAND_CMD_NONE, 0 | NAND_CTRL_CHANGE);
-       } else if (mchip_nr >= 0 && mchip_nr < NAND_MAX_CHIPS) {
-               fun->mchip_number = mchip_nr;
-               chip->legacy.IO_ADDR_R = fun->io_base + fun->mchip_offsets[mchip_nr];
-               chip->legacy.IO_ADDR_W = chip->legacy.IO_ADDR_R;
-       } else {
-               BUG();
-       }
-}
-
-static uint8_t fun_read_byte(struct nand_chip *chip)
-{
-       struct fsl_upm_nand *fun = to_fsl_upm_nand(nand_to_mtd(chip));
-
-       return in_8(fun->chip.legacy.IO_ADDR_R);
-}
-
-static void fun_read_buf(struct nand_chip *chip, uint8_t *buf, int len)
-{
-       struct fsl_upm_nand *fun = to_fsl_upm_nand(nand_to_mtd(chip));
-       int i;
-
-       for (i = 0; i < len; i++)
-               buf[i] = in_8(fun->chip.legacy.IO_ADDR_R);
-}
-
-static void fun_write_buf(struct nand_chip *chip, const uint8_t *buf, int len)
-{
-       struct fsl_upm_nand *fun = to_fsl_upm_nand(nand_to_mtd(chip));
-       int i;
-
-       for (i = 0; i < len; i++) {
-               out_8(fun->chip.legacy.IO_ADDR_W, buf[i]);
-               if (fun->wait_flags & FSL_UPM_WAIT_WRITE_BYTE)
-                       fun_wait_rnb(fun);
-       }
-       if (fun->wait_flags & FSL_UPM_WAIT_WRITE_BUFFER)
-               fun_wait_rnb(fun);
-}
-
 static int fun_chip_init(struct fsl_upm_nand *fun,
                         const struct device_node *upm_np,
                         const struct resource *io_res)
@@ -153,21 +47,8 @@ static int fun_chip_init(struct fsl_upm_nand *fun,
        int ret;
        struct device_node *flash_np;
 
-       fun->chip.legacy.IO_ADDR_R = fun->io_base;
-       fun->chip.legacy.IO_ADDR_W = fun->io_base;
-       fun->chip.legacy.cmd_ctrl = fun_cmd_ctrl;
-       fun->chip.legacy.chip_delay = fun->chip_delay;
-       fun->chip.legacy.read_byte = fun_read_byte;
-       fun->chip.legacy.read_buf = fun_read_buf;
-       fun->chip.legacy.write_buf = fun_write_buf;
        fun->chip.ecc.mode = NAND_ECC_SOFT;
        fun->chip.ecc.algo = NAND_ECC_HAMMING;
-       if (fun->mchip_count > 1)
-               fun->chip.legacy.select_chip = fun_select_chip;
-
-       if (!fun->rnb_gpio[0])
-               fun->chip.legacy.dev_ready = fun_chip_ready;
-
        fun->chip.controller = &fun->base;
        mtd->dev.parent = fun->dev;
 
@@ -342,23 +223,9 @@ static int fun_probe(struct platform_device *ofdev)
                }
        }
 
-       prop = of_get_property(ofdev->dev.of_node, "chip-delay", NULL);
-       if (prop)
-               fun->chip_delay = be32_to_cpup(prop);
-       else
-               fun->chip_delay = 50;
-
-       prop = of_get_property(ofdev->dev.of_node, "fsl,upm-wait-flags", &size);
-       if (prop && size == sizeof(uint32_t))
-               fun->wait_flags = be32_to_cpup(prop);
-       else
-               fun->wait_flags = FSL_UPM_WAIT_RUN_PATTERN |
-                                 FSL_UPM_WAIT_WRITE_BYTE;
-
        nand_controller_init(&fun->base);
        fun->base.ops = &fun_ops;
        fun->dev = &ofdev->dev;
-       fun->last_ctrl = NAND_CLE;
 
        ret = fun_chip_init(fun, ofdev->dev.of_node, io_res);
        if (ret)