diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-16 15:21:26 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-17 12:05:48 +0100 |
| commit | ba62a5bc7d248fcb8ba1ffffd72708c5ad9b07af (patch) | |
| tree | 07c08edc2281a83d9140a3552d6421b44741a70d /drivers/mtd/nand/nand_imx.c | |
| parent | a391fc06f4d565b1fae7ebf3b9f03b4bb0c22e00 (diff) | |
| download | barebox-ba62a5bc7d248fcb8ba1ffffd72708c5ad9b07af.tar.gz barebox-ba62a5bc7d248fcb8ba1ffffd72708c5ad9b07af.tar.xz | |
mtd: nand-imx: remove dead code
Neither CONFIG_MXC_NAND_LOW_LEVEL_ERASE nor CONFIG_MTD_NAND_MXC_FORCE_CE
are defined anywhere, remove the code inside the ifdefs.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/nand/nand_imx.c')
| -rw-r--r-- | drivers/mtd/nand/nand_imx.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c index fd80c72008..77c0ad8a8b 100644 --- a/drivers/mtd/nand/nand_imx.c +++ b/drivers/mtd/nand/nand_imx.c @@ -691,26 +691,6 @@ static void copy_spare(struct mtd_info *mtd, int bfrom) */ static void imx_nand_select_chip(struct mtd_info *mtd, int chip) { -#ifdef CONFIG_MTD_NAND_MXC_FORCE_CE - u16 tmp; - - if (chip > 0) { - MTD_DEBUG(MTD_DEBUG_LEVEL0, - "ERROR: Illegal chip select (chip = %d)\n", chip); - return; - } - - if (chip == -1) { - tmp = readw(host->regs + NFC_CONFIG1); - tmp &= ~NFC_CE; - writew(tmp, host->regs + NFC_CONFIG1); - return; - } - - tmp = readw(host->regs + NFC_CONFIG1); - tmp |= NFC_CE; - writew(tmp, host->regs + NFC_CONFIG1); -#endif } static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) @@ -1019,31 +999,6 @@ static void imx_nand_command(struct mtd_info *mtd, unsigned command, } } -#ifdef CONFIG_MXC_NAND_LOW_LEVEL_ERASE -static void imx_low_erase(struct mtd_info *mtd) -{ - - struct nand_chip *this = mtd->priv; - unsigned int page_addr, addr; - u_char status; - - MTD_DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : imx_low_erase:Erasing NAND\n"); - for (addr = 0; addr < this->chipsize; addr += mtd->erasesize) { - page_addr = addr / mtd->writesize; - imx_nand_command(mtd, NAND_CMD_ERASE1, -1, page_addr); - imx_nand_command(mtd, NAND_CMD_ERASE2, -1, -1); - imx_nand_command(mtd, NAND_CMD_STATUS, -1, -1); - status = imx_nand_read_byte(mtd); - if (status & NAND_STATUS_FAIL) { - printk(KERN_ERR - "ERASE FAILED(block = %d,status = 0x%x)\n", - addr / mtd->erasesize, status); - } - } - -} -#endif - /* * The generic flash bbt decriptors overlap with our ecc * hardware, so define some i.MX specific ones. |