aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2014-08-06 21:16:59 -0400
committerBrian Norris <computersforpeace@gmail.com>2014-11-05 05:08:21 -0500
commit8fdc6cd45891d26e2c82ad22cc6f85cbb4d526d2 (patch)
treed5f9e7cc4629388b9a024713a5c7fedd1e3077b8
parent6af91949ab7462d0917f436820c263ae9a89322c (diff)
mtd: fsl-quadspi: drop wait-till-ready checks
spi-nor.c should be taking care of these now. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Huang Shijie <b32955@freescale.com> Reviewed-by: Marek Vasut <marex@denx.de>
-rw-r--r--drivers/mtd/spi-nor/fsl-quadspi.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
index b6aab38c4a97..03dcffac8185 100644
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
@@ -719,16 +719,10 @@ static int fsl_qspi_read(struct spi_nor *nor, loff_t from,
719{ 719{
720 struct fsl_qspi *q = nor->priv; 720 struct fsl_qspi *q = nor->priv;
721 u8 cmd = nor->read_opcode; 721 u8 cmd = nor->read_opcode;
722 int ret;
723 722
724 dev_dbg(q->dev, "cmd [%x],read from (0x%p, 0x%.8x, 0x%.8x),len:%d\n", 723 dev_dbg(q->dev, "cmd [%x],read from (0x%p, 0x%.8x, 0x%.8x),len:%d\n",
725 cmd, q->ahb_base, q->chip_base_addr, (unsigned int)from, len); 724 cmd, q->ahb_base, q->chip_base_addr, (unsigned int)from, len);
726 725
727 /* Wait until the previous command is finished. */
728 ret = nor->wait_till_ready(nor);
729 if (ret)
730 return ret;
731
732 /* Read out the data directly from the AHB buffer.*/ 726 /* Read out the data directly from the AHB buffer.*/
733 memcpy(buf, q->ahb_base + q->chip_base_addr + from, len); 727 memcpy(buf, q->ahb_base + q->chip_base_addr + from, len);
734 728
@@ -744,11 +738,6 @@ static int fsl_qspi_erase(struct spi_nor *nor, loff_t offs)
744 dev_dbg(nor->dev, "%dKiB at 0x%08x:0x%08x\n", 738 dev_dbg(nor->dev, "%dKiB at 0x%08x:0x%08x\n",
745 nor->mtd->erasesize / 1024, q->chip_base_addr, (u32)offs); 739 nor->mtd->erasesize / 1024, q->chip_base_addr, (u32)offs);
746 740
747 /* Wait until finished previous write command. */
748 ret = nor->wait_till_ready(nor);
749 if (ret)
750 return ret;
751
752 /* Send write enable, then erase commands. */ 741 /* Send write enable, then erase commands. */
753 ret = nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0, 0); 742 ret = nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0, 0);
754 if (ret) 743 if (ret)