mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-02-19 05:07:04 +07:00
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>
This commit is contained in:
parent
f45eb7b522
commit
44772fa5ec
@ -35,7 +35,6 @@
|
|||||||
#define NAND_CMD_CS BIT(4) /* chip select */
|
#define NAND_CMD_CS BIT(4) /* chip select */
|
||||||
#define NAND_CMD_SE BIT(5) /* spare area access latch */
|
#define NAND_CMD_SE BIT(5) /* spare area access latch */
|
||||||
#define NAND_CMD_WP BIT(6) /* write protect */
|
#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_CMD (NAND_CMD_CS | NAND_CMD_CLE)
|
||||||
#define NAND_WRITE_ADDR (NAND_CMD_CS | NAND_CMD_ALE)
|
#define NAND_WRITE_ADDR (NAND_CMD_CS | NAND_CMD_ALE)
|
||||||
#define NAND_WRITE_DATA (NAND_CMD_CS)
|
#define NAND_WRITE_DATA (NAND_CMD_CS)
|
||||||
@ -68,22 +67,6 @@ struct xway_nand_data {
|
|||||||
struct nand_chip chip;
|
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)
|
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
|
| NAND_CON_SE_P | NAND_CON_WP_P | NAND_CON_PRE_P
|
||||||
| cs_flag, EBU_NAND_CON);
|
| cs_flag, EBU_NAND_CON);
|
||||||
|
|
||||||
/* finish with a reset */
|
|
||||||
xway_reset_chip(&data->chip);
|
|
||||||
|
|
||||||
/* Scan to find existence of the device */
|
/* Scan to find existence of the device */
|
||||||
err = nand_scan(mtd, 1);
|
err = nand_scan(mtd, 1);
|
||||||
if (err)
|
if (err)
|
||||||
|
Loading…
Reference in New Issue
Block a user