[46/88] mtd: Drop unused fsl_upm driver

This is not used since this commit:

   8d1e3cb1400 powerpc: mpc83xx: remove MPC8360ERDK, EMPC8360EMDS support

Drop the driver and Kconfig option.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 drivers/mtd/nand/raw/Makefile  |   1 -
 drivers/mtd/nand/raw/fsl_upm.c | 187 ---------------------------------
 include/linux/mtd/fsl_upm.h    |  44 --------
 3 files changed, 232 deletions(-)
 delete mode 100644 drivers/mtd/nand/raw/fsl_upm.c
 delete mode 100644 include/linux/mtd/fsl_upm.h

Hi

On Mon, Jan 23, 2023 at 11:03 PM Simon Glass <sjg@chromium.org> wrote:
>
> This is not used since this commit:
>
>    8d1e3cb1400 powerpc: mpc83xx: remove MPC8360ERDK, EMPC8360EMDS support
>

No problem to drop here.

> Drop the driver and Kconfig option.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  drivers/mtd/nand/raw/Makefile  |   1 -
>  drivers/mtd/nand/raw/fsl_upm.c | 187 ---------------------------------
>  include/linux/mtd/fsl_upm.h    |  44 --------
>  3 files changed, 232 deletions(-)
>  delete mode 100644 drivers/mtd/nand/raw/fsl_upm.c
>  delete mode 100644 include/linux/mtd/fsl_upm.h
>
> diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile
> index 4c59903aa8c..e8764cf358b 100644
> --- a/drivers/mtd/nand/raw/Makefile
> +++ b/drivers/mtd/nand/raw/Makefile
> @@ -56,7 +56,6 @@ obj-$(CONFIG_NAND_DENALI) += denali.o
>  obj-$(CONFIG_NAND_DENALI_DT) += denali_dt.o
>  obj-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
>  obj-$(CONFIG_NAND_FSL_IFC) += fsl_ifc_nand.o
> -obj-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
>  obj-$(CONFIG_NAND_FSMC) += fsmc_nand.o
>  obj-$(CONFIG_NAND_KB9202) += kb9202_nand.o
>  obj-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
> diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c
> deleted file mode 100644
> index 91cc1339537..00000000000
> --- a/drivers/mtd/nand/raw/fsl_upm.c
> +++ /dev/null
> @@ -1,187 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * FSL UPM NAND driver
> - *
> - * Copyright (C) 2007 MontaVista Software, Inc.
> - *                    Anton Vorontsov <avorontsov@ru.mvista.com>
> - */
> -
> -#include <config.h>
> -#include <common.h>
> -#include <log.h>
> -#include <asm/io.h>
> -#include <linux/delay.h>
> -#include <linux/errno.h>
> -#include <linux/mtd/mtd.h>
> -#include <linux/mtd/rawnand.h>
> -#include <linux/mtd/fsl_upm.h>
> -#include <nand.h>
> -
> -static void fsl_upm_start_pattern(struct fsl_upm *upm, u32 pat_offset)
> -{
> -       clrsetbits_be32(upm->mxmr, MxMR_MAD_MSK, MxMR_OP_RUNP | pat_offset);
> -       (void)in_be32(upm->mxmr);
> -}
> -
> -static void fsl_upm_end_pattern(struct fsl_upm *upm)
> -{
> -       clrbits_be32(upm->mxmr, MxMR_OP_RUNP);
> -
> -       while (in_be32(upm->mxmr) & MxMR_OP_RUNP)
> -               eieio();
> -}
> -
> -static void fsl_upm_run_pattern(struct fsl_upm *upm, int width,
> -                               void __iomem *io_addr, u32 mar)
> -{
> -       out_be32(upm->mar, mar);
> -       (void)in_be32(upm->mar);
> -       switch (width) {
> -       case 8:
> -               out_8(io_addr, 0x0);
> -               break;
> -       case 16:
> -               out_be16(io_addr, 0x0);
> -               break;
> -       case 32:
> -               out_be32(io_addr, 0x0);
> -               break;
> -       }
> -}
> -
> -static void fun_wait(struct fsl_upm_nand *fun)
> -{
> -       if (fun->dev_ready) {
> -               while (!fun->dev_ready(fun->chip_nr))
> -                       debug("unexpected busy state\n");
> -       } else {
> -               /*
> -                * If the R/B pin is not connected,
> -                * a short delay is necessary.
> -                */
> -               udelay(1);
> -       }
> -}
> -
> -#if CONFIG_SYS_NAND_MAX_CHIPS > 1
> -static void fun_select_chip(struct mtd_info *mtd, int chip_nr)
> -{
> -       struct nand_chip *chip = mtd_to_nand(mtd);
> -       struct fsl_upm_nand *fun = nand_get_controller_data(chip);
> -
> -       if (chip_nr >= 0) {
> -               fun->chip_nr = chip_nr;
> -               chip->IO_ADDR_R = chip->IO_ADDR_W =
> -                       fun->upm.io_addr + fun->chip_offset * chip_nr;
> -       } else if (chip_nr == -1) {
> -               chip->cmd_ctrl(mtd, NAND_CMD_NONE, 0 | NAND_CTRL_CHANGE);
> -       }
> -}
> -#endif
> -
> -static void fun_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
> -{
> -       struct nand_chip *chip = mtd_to_nand(mtd);
> -       struct fsl_upm_nand *fun = nand_get_controller_data(chip);
> -       void __iomem *io_addr;
> -       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->width);
> -       io_addr = fun->upm.io_addr;
> -#if CONFIG_SYS_NAND_MAX_CHIPS > 1
> -       if (fun->chip_nr > 0) {
> -               io_addr += fun->chip_offset * fun->chip_nr;
> -               if (fun->upm_mar_chip_offset)
> -                       mar |= fun->upm_mar_chip_offset * fun->chip_nr;
> -       }
> -#endif
> -       fsl_upm_run_pattern(&fun->upm, fun->width, io_addr, mar);
> -
> -       /*
> -        * Some boards/chips needs this.  At least the MPC8360E-RDK
> -        * needs it.  Probably weird chip, because I don't see any
> -        * need for this on MPC8555E + Samsung K9F1G08U0A.  Usually
> -        * here are 0-2 unexpected busy states per block read.
> -        */
> -       if (fun->wait_flags & FSL_UPM_WAIT_RUN_PATTERN)
> -               fun_wait(fun);
> -}
> -
> -static u8 upm_nand_read_byte(struct mtd_info *mtd)
> -{
> -       struct nand_chip *chip = mtd_to_nand(mtd);
> -
> -       return in_8(chip->IO_ADDR_R);
> -}
> -
> -static void upm_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
> -{
> -       int i;
> -       struct nand_chip *chip = mtd_to_nand(mtd);
> -       struct fsl_upm_nand *fun = nand_get_controller_data(chip);
> -
> -       for (i = 0; i < len; i++) {
> -               out_8(chip->IO_ADDR_W, buf[i]);
> -               if (fun->wait_flags & FSL_UPM_WAIT_WRITE_BYTE)
> -                       fun_wait(fun);
> -       }
> -
> -       if (fun->wait_flags & FSL_UPM_WAIT_WRITE_BUFFER)
> -               fun_wait(fun);
> -}
> -
> -static void upm_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
> -{
> -       int i;
> -       struct nand_chip *chip = mtd_to_nand(mtd);
> -
> -       for (i = 0; i < len; i++)
> -               buf[i] = in_8(chip->IO_ADDR_R);
> -}
> -
> -static int nand_dev_ready(struct mtd_info *mtd)
> -{
> -       struct nand_chip *chip = mtd_to_nand(mtd);
> -       struct fsl_upm_nand *fun = nand_get_controller_data(chip);
> -
> -       return fun->dev_ready(fun->chip_nr);
> -}
> -
> -int fsl_upm_nand_init(struct nand_chip *chip, struct fsl_upm_nand *fun)
> -{
> -       if (fun->width != 8 && fun->width != 16 && fun->width != 32)
> -               return -ENOSYS;
> -
> -       fun->last_ctrl = NAND_CLE;
> -
> -       nand_set_controller_data(chip, fun);
> -       chip->chip_delay = fun->chip_delay;
> -       chip->ecc.mode = NAND_ECC_SOFT;
> -       chip->cmd_ctrl = fun_cmd_ctrl;
> -#if CONFIG_SYS_NAND_MAX_CHIPS > 1
> -       chip->select_chip = fun_select_chip;
> -#endif
> -       chip->read_byte = upm_nand_read_byte;
> -       chip->read_buf = upm_nand_read_buf;
> -       chip->write_buf = upm_nand_write_buf;
> -       if (fun->dev_ready)
> -               chip->dev_ready = nand_dev_ready;
> -
> -       return 0;
> -}
> diff --git a/include/linux/mtd/fsl_upm.h b/include/linux/mtd/fsl_upm.h
> deleted file mode 100644
> index 9999993543b..00000000000
> --- a/include/linux/mtd/fsl_upm.h
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * FSL UPM NAND driver
> - *
> - * Copyright (C) 2007 MontaVista Software, Inc.
> - *                    Anton Vorontsov <avorontsov@ru.mvista.com>
> - */
> -
> -#ifndef __LINUX_MTD_NAND_FSL_UPM
> -#define __LINUX_MTD_NAND_FSL_UPM
> -
> -#include <linux/mtd/rawnand.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 {
> -       void __iomem *mdr;
> -       void __iomem *mxmr;
> -       void __iomem *mar;
> -       void __iomem *io_addr;
> -};
> -
> -struct fsl_upm_nand {
> -       struct fsl_upm upm;
> -
> -       int width;
> -       int upm_cmd_offset;
> -       int upm_addr_offset;
> -       int upm_mar_chip_offset;
> -       int wait_flags;
> -       int (*dev_ready)(int chip_nr);
> -       int chip_delay;
> -       int chip_offset;
> -       int chip_nr;
> -
> -       /* no need to fill */
> -       int last_ctrl;
> -};
> -
> -extern int fsl_upm_nand_init(struct nand_chip *chip, struct fsl_upm_nand *fun);
> -
> -#endif
> --
> 2.39.1.456.gfc5497dd1b-goog
>
Reviewed-By: Michael Trimarchi <michael@amarulasolutions.com>