summaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-06-21 00:32:10 +0300
committerBoris Brezillon <boris.brezillon@free-electrons.com>2016-07-11 09:40:15 +0300
commit44772fa5ec4162ef133f1294299d1e1ada7d2d11 (patch)
treedf7bc14186a3826d26ff6fb3e07fa8d04ae7d1fb /drivers/mtd
parentf45eb7b522359260606852d79a8899e5db37d8f3 (diff)
downloadlinux-44772fa5ec4162ef133f1294299d1e1ada7d2d11.tar.xz
mtd: nand: xway: remove manual reset
nand_scan() already resets the NAND flash chip, this driver does not have to call it manually. The xway_reset_chip() functions does the same as the normal NAND reset function. The waiting for the NAND_WAIT_WR_C is done in xway_cmd_ctrl(). Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/xway_nand.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
index 6028edbad644..ab93b3536877 100644
--- a/drivers/mtd/nand/xway_nand.c
+++ b/drivers/mtd/nand/xway_nand.c
@@ -35,7 +35,6 @@
#define NAND_CMD_CS BIT(4) /* chip select */
#define NAND_CMD_SE BIT(5) /* spare area access latch */
#define NAND_CMD_WP BIT(6) /* write protect */
-#define NAND_WRITE_CMD_RESET 0xff
#define NAND_WRITE_CMD (NAND_CMD_CS | NAND_CMD_CLE)
#define NAND_WRITE_ADDR (NAND_CMD_CS | NAND_CMD_ALE)
#define NAND_WRITE_DATA (NAND_CMD_CS)
@@ -68,22 +67,6 @@ struct xway_nand_data {
struct nand_chip chip;
};
-static void xway_reset_chip(struct nand_chip *chip)
-{
- unsigned long nandaddr = (unsigned long) chip->IO_ADDR_W;
- unsigned long flags;
-
- nandaddr &= ~NAND_WRITE_ADDR;
- nandaddr |= NAND_WRITE_CMD;
-
- /* finish with a reset */
- spin_lock_irqsave(&ebu_lock, flags);
- writeb(NAND_WRITE_CMD_RESET, (void __iomem *) nandaddr);
- while ((ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_WR_C) == 0)
- ;
- spin_unlock_irqrestore(&ebu_lock, flags);
-}
-
static void xway_select_chip(struct mtd_info *mtd, int chip)
{
@@ -199,9 +182,6 @@ static int xway_nand_probe(struct platform_device *pdev)
| NAND_CON_SE_P | NAND_CON_WP_P | NAND_CON_PRE_P
| cs_flag, EBU_NAND_CON);
- /* finish with a reset */
- xway_reset_chip(&data->chip);
-
/* Scan to find existence of the device */
err = nand_scan(mtd, 1);
if (err)