mtd: rawnand: Remove the cmx270 NAND controller driver
authorBoris Brezillon <boris.brezillon@collabora.com>
Mon, 18 May 2020 16:33:00 +0000 (18:33 +0200)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Sun, 24 May 2020 18:39:53 +0000 (20:39 +0200)
The CM-X270 board has been removed, we can remove the custom NAND
driver as well.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200518163300.304732-1-boris.brezillon@collabora.com
drivers/mtd/nand/raw/Kconfig
drivers/mtd/nand/raw/Makefile
drivers/mtd/nand/raw/cmx270_nand.c [deleted file]

index a80a46bb5b8bca840ad2718f3a3a84d4d08c2ea5..9b08a58ae88e6017280d33e5155055b56fab65c1 100644 (file)
@@ -213,10 +213,6 @@ config MTD_NAND_MLC_LPC32XX
          Please check the actual NAND chip connected and its support
          by the MLC NAND controller.
 
-config MTD_NAND_CM_X270
-       tristate "CM-X270 modules NAND controller"
-       depends on MACH_ARMCORE
-
 config MTD_NAND_PASEMI
        tristate "PA Semi PWRficient NAND controller"
        depends on PPC_PASEMI
index 2d136b158fb7e199895b6d4158d5723d64075250..a817052286c7ede6f0a3cbc69ca13febb37f27d1 100644 (file)
@@ -25,7 +25,6 @@ obj-$(CONFIG_MTD_NAND_GPIO)           += gpio.o
 omap2_nand-objs := omap2.o
 obj-$(CONFIG_MTD_NAND_OMAP2)           += omap2_nand.o
 obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD)  += omap_elm.o
-obj-$(CONFIG_MTD_NAND_CM_X270)         += cmx270_nand.o
 obj-$(CONFIG_MTD_NAND_MARVELL)         += marvell_nand.o
 obj-$(CONFIG_MTD_NAND_TMIO)            += tmio_nand.o
 obj-$(CONFIG_MTD_NAND_PLATFORM)                += plat_nand.o
diff --git a/drivers/mtd/nand/raw/cmx270_nand.c b/drivers/mtd/nand/raw/cmx270_nand.c
deleted file mode 100644 (file)
index 045b617..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- *  Copyright (C) 2006 Compulab, Ltd.
- *  Mike Rapoport <mike@compulab.co.il>
- *
- *  Derived from drivers/mtd/nand/h1910.c (removed in v3.10)
- *       Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
- *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
- *
- *  Overview:
- *   This is a device driver for the NAND flash device found on the
- *   CM-X270 board.
- */
-
-#include <linux/mtd/rawnand.h>
-#include <linux/mtd/partitions.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
-#include <linux/module.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/mach-types.h>
-
-#include <mach/pxa2xx-regs.h>
-
-#define GPIO_NAND_CS   (11)
-#define GPIO_NAND_RB   (89)
-
-/* MTD structure for CM-X270 board */
-static struct mtd_info *cmx270_nand_mtd;
-
-/* remaped IO address of the device */
-static void __iomem *cmx270_nand_io;
-
-/*
- * Define static partitions for flash device
- */
-static const struct mtd_partition partition_info[] = {
-       [0] = {
-               .name   = "cmx270-0",
-               .offset = 0,
-               .size   = MTDPART_SIZ_FULL
-       }
-};
-#define NUM_PARTITIONS (ARRAY_SIZE(partition_info))
-
-static u_char cmx270_read_byte(struct nand_chip *this)
-{
-       return (readl(this->legacy.IO_ADDR_R) >> 16);
-}
-
-static void cmx270_write_buf(struct nand_chip *this, const u_char *buf,
-                            int len)
-{
-       int i;
-
-       for (i=0; i<len; i++)
-               writel((*buf++ << 16), this->legacy.IO_ADDR_W);
-}
-
-static void cmx270_read_buf(struct nand_chip *this, u_char *buf, int len)
-{
-       int i;
-
-       for (i=0; i<len; i++)
-               *buf++ = readl(this->legacy.IO_ADDR_R) >> 16;
-}
-
-static inline void nand_cs_on(void)
-{
-       gpio_set_value(GPIO_NAND_CS, 0);
-}
-
-static void nand_cs_off(void)
-{
-       dsb();
-
-       gpio_set_value(GPIO_NAND_CS, 1);
-}
-
-/*
- *     hardware specific access to control-lines
- */
-static void cmx270_hwcontrol(struct nand_chip *this, int dat,
-                            unsigned int ctrl)
-{
-       unsigned int nandaddr = (unsigned int)this->legacy.IO_ADDR_W;
-
-       dsb();
-
-       if (ctrl & NAND_CTRL_CHANGE) {
-               if ( ctrl & NAND_ALE )
-                       nandaddr |=  (1 << 3);
-               else
-                       nandaddr &= ~(1 << 3);
-               if ( ctrl & NAND_CLE )
-                       nandaddr |=  (1 << 2);
-               else
-                       nandaddr &= ~(1 << 2);
-               if ( ctrl & NAND_NCE )
-                       nand_cs_on();
-               else
-                       nand_cs_off();
-       }
-
-       dsb();
-       this->legacy.IO_ADDR_W = (void __iomem*)nandaddr;
-       if (dat != NAND_CMD_NONE)
-               writel((dat << 16), this->legacy.IO_ADDR_W);
-
-       dsb();
-}
-
-/*
- *     read device ready pin
- */
-static int cmx270_device_ready(struct nand_chip *this)
-{
-       dsb();
-
-       return (gpio_get_value(GPIO_NAND_RB));
-}
-
-/*
- * Main initialization routine
- */
-static int __init cmx270_init(void)
-{
-       struct nand_chip *this;
-       int ret;
-
-       if (!(machine_is_armcore() && cpu_is_pxa27x()))
-               return -ENODEV;
-
-       ret = gpio_request(GPIO_NAND_CS, "NAND CS");
-       if (ret) {
-               pr_warn("CM-X270: failed to request NAND CS gpio\n");
-               return ret;
-       }
-
-       gpio_direction_output(GPIO_NAND_CS, 1);
-
-       ret = gpio_request(GPIO_NAND_RB, "NAND R/B");
-       if (ret) {
-               pr_warn("CM-X270: failed to request NAND R/B gpio\n");
-               goto err_gpio_request;
-       }
-
-       gpio_direction_input(GPIO_NAND_RB);
-
-       /* Allocate memory for MTD device structure and private data */
-       this = kzalloc(sizeof(struct nand_chip), GFP_KERNEL);
-       if (!this) {
-               ret = -ENOMEM;
-               goto err_kzalloc;
-       }
-
-       cmx270_nand_io = ioremap(PXA_CS1_PHYS, 12);
-       if (!cmx270_nand_io) {
-               pr_debug("Unable to ioremap NAND device\n");
-               ret = -EINVAL;
-               goto err_ioremap;
-       }
-
-       cmx270_nand_mtd = nand_to_mtd(this);
-
-       /* Link the private data with the MTD structure */
-       cmx270_nand_mtd->owner = THIS_MODULE;
-
-       /* insert callbacks */
-       this->legacy.IO_ADDR_R = cmx270_nand_io;
-       this->legacy.IO_ADDR_W = cmx270_nand_io;
-       this->legacy.cmd_ctrl = cmx270_hwcontrol;
-       this->legacy.dev_ready = cmx270_device_ready;
-
-       /* 15 us command delay time */
-       this->legacy.chip_delay = 20;
-       this->ecc.mode = NAND_ECC_SOFT;
-       this->ecc.algo = NAND_ECC_HAMMING;
-
-       /* read/write functions */
-       this->legacy.read_byte = cmx270_read_byte;
-       this->legacy.read_buf = cmx270_read_buf;
-       this->legacy.write_buf = cmx270_write_buf;
-
-       /* Scan to find existence of the device */
-       ret = nand_scan(this, 1);
-       if (ret) {
-               pr_notice("No NAND device\n");
-               goto err_scan;
-       }
-
-       /* Register the partitions */
-       ret = mtd_device_register(cmx270_nand_mtd, partition_info,
-                                 NUM_PARTITIONS);
-       if (ret)
-               goto err_scan;
-
-       /* Return happy */
-       return 0;
-
-err_scan:
-       iounmap(cmx270_nand_io);
-err_ioremap:
-       kfree(this);
-err_kzalloc:
-       gpio_free(GPIO_NAND_RB);
-err_gpio_request:
-       gpio_free(GPIO_NAND_CS);
-
-       return ret;
-
-}
-module_init(cmx270_init);
-
-/*
- * Clean up routine
- */
-static void __exit cmx270_cleanup(void)
-{
-       /* Release resources, unregister device */
-       nand_release(mtd_to_nand(cmx270_nand_mtd));
-
-       gpio_free(GPIO_NAND_RB);
-       gpio_free(GPIO_NAND_CS);
-
-       iounmap(cmx270_nand_io);
-
-       kfree(mtd_to_nand(cmx270_nand_mtd));
-}
-module_exit(cmx270_cleanup);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
-MODULE_DESCRIPTION("NAND flash driver for Compulab CM-X270 Module");