hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtd: m25p80: drop wait-till-ready checks 

spi-nor.c should be taking care of these now.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Brian Norris 2014-08-06 18:16:58 -07:00
parent dfa9c0cba4
commit 6af91949ab
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mtd/devices/m25p80.c
View File

@ -129,16 +129,10 @@ static int m25p80_read(struct spi_nor *nor, loff_t from, size_t len,
struct spi_transfer t[2]; struct spi_transfer t[2];
struct spi_message m; struct spi_message m;
unsigned int dummy = nor->read_dummy; unsigned int dummy = nor->read_dummy;
int ret;
/* convert the dummy cycles to the number of bytes */ /* convert the dummy cycles to the number of bytes */
dummy /= 8; dummy /= 8;
/* Wait till previous write/erase is done. */
ret = nor->wait_till_ready(nor);
if (ret)
return ret;
spi_message_init(&m); spi_message_init(&m);
memset(t, 0, (sizeof t)); memset(t, 0, (sizeof t));
@ -168,11 +162,6 @@ static int m25p80_erase(struct spi_nor *nor, loff_t offset)
dev_dbg(nor->dev, "%dKiB at 0x%08x\n", dev_dbg(nor->dev, "%dKiB at 0x%08x\n",
flash->mtd.erasesize / 1024, (u32)offset); flash->mtd.erasesize / 1024, (u32)offset);
/* Wait until finished previous write command. */
ret = nor->wait_till_ready(nor);
if (ret)
return ret;
/* Send write enable, then erase commands. */ /* Send write enable, then erase commands. */
ret = nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0, 0); ret = nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0, 0);
if (ret) if (ret)

6
include/linux/mtd/spi-nor.h
View File

@ -116,6 +116,10 @@ enum spi_nor_ops {
SPI_NOR_OPS_UNLOCK, SPI_NOR_OPS_UNLOCK,
}; };
enum spi_nor_option_flags {
SNOR_F_USE_FSR = BIT(0),
};
/** /**
* struct spi_nor - Structure for defining a the SPI NOR layer * struct spi_nor - Structure for defining a the SPI NOR layer
* @mtd: point to a mtd_info structure * @mtd: point to a mtd_info structure
@ -129,6 +133,7 @@ enum spi_nor_ops {
* @program_opcode: the program opcode * @program_opcode: the program opcode
* @flash_read: the mode of the read * @flash_read: the mode of the read
* @sst_write_second: used by the SST write operation * @sst_write_second: used by the SST write operation
* @flags: flag options for the current SPI-NOR (SNOR_F_*)
* @cfg: used by the read_xfer/write_xfer * @cfg: used by the read_xfer/write_xfer
* @cmd_buf: used by the write_reg * @cmd_buf: used by the write_reg
* @prepare: [OPTIONAL] do some preparations for the * @prepare: [OPTIONAL] do some preparations for the
@ -158,6 +163,7 @@ struct spi_nor {
u8 program_opcode; u8 program_opcode;
enum read_mode flash_read; enum read_mode flash_read;
bool sst_write_second; bool sst_write_second;
u32 flags;
struct spi_nor_xfer_cfg cfg; struct spi_nor_xfer_cfg cfg;
u8 cmd_buf[SPI_NOR_MAX_CMD_SIZE]; u8 cmd_buf[SPI_NOR_MAX_CMD_SIZE];