Re: [PATCH 46/88] mtd: Drop unused fsl_upm driver
Hi
On Mon, Jan 23, 2023 at 11:03 PM Simon Glass 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
> ---
>
> 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..000
> --- 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
> - */
> -
> -#include
> -#include
> -#include
> -#include
> -#include
> -#include
> -#include
> -#include
> -#include
> -#include
> -
> -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(>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(>upm,
> fun->upm_addr_offset);
> - else if (ctrl & NAND_CLE)
> - fsl_upm_start_pattern(>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(>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
> -
[PATCH 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
---
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..000
--- 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
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-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(>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(>upm, fun->upm_addr_offset);
- else if (ctrl & NAND_CLE)
- fsl_upm_start_pattern(>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(>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);
-}
-
