Discovered the read dummy_cycles based on the configured
read command.
Signed-off-by: Jagannadha Sutradharudu Teki<jaga...@xilinx.com>
---
drivers/mtd/spi/sf_internal.h | 2 ++
drivers/mtd/spi/sf_ops.c | 10 ++++++----
drivers/mtd/spi/sf_probe.c | 12 ++++++++++++
include/spi_flash.h | 2 ++
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/spi/sf_internal.h
b/drivers/mtd/spi/sf_internal.h
index 7be0292..a9f5a81 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -10,6 +10,8 @@
#ifndef _SF_INTERNAL_H_
#define _SF_INTERNAL_H_
+#define SPI_FLASH_3B_ADDR_LEN 3
+#define SPI_FLASH_CMD_LEN (1 + SPI_FLASH_3B_ADDR_LEN)
#define SPI_FLASH_16MB_BOUN 0x1000000
/* CFI Manufacture ID's */
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
index 827f719..dda75b1 100644
--- a/drivers/mtd/spi/sf_ops.c
+++ b/drivers/mtd/spi/sf_ops.c
@@ -9,6 +9,7 @@
*/
#include<common.h>
+#include<malloc.h>
#include<spi.h>
#include<spi_flash.h>
#include<watchdog.h>
@@ -216,7 +217,7 @@ int spi_flash_write_common(struct spi_flash *flash,
const u8 *cmd,
int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset,
size_t
len)
{
u32 erase_size;
- u8 cmd[4];
+ u8 cmd[SPI_FLASH_CMD_LEN];
int ret = -1;
erase_size = flash->erase_size;
@@ -255,7 +256,7 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash,
u32 offset,
{
unsigned long byte_addr, page_size;
size_t chunk_len, actual;
- u8 cmd[4];
+ u8 cmd[SPI_FLASH_CMD_LEN];
int ret = -1;
page_size = flash->page_size;
@@ -317,7 +318,7 @@ int spi_flash_read_common(struct spi_flash *flash,
const u8 *cmd,
int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
size_t len, void *data)
{
- u8 cmd[5], bank_sel = 0;
+ u8 *cmd, bank_sel = 0;
u32 remain_len, read_len;
int ret = -1;
@@ -335,8 +336,9 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash,
u32 offset,
return 0;
}
+ cmd = malloc(SPI_FLASH_CMD_LEN + flash->dummy_cycles);
+ memset(cmd, 0, SPI_FLASH_CMD_LEN + flash->dummy_cycles);
cmd[0] = flash->read_cmd;
- cmd[4] = 0x00;
while (len) {
#ifdef CONFIG_SPI_FLASH_BAR
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index a049e72..b070adc 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -140,6 +140,18 @@ static struct spi_flash
*spi_flash_validate_params(struct spi_slave *spi,
}
}
+ /* Read dummy cycles */
+ switch (flash->read_cmd) {
+ case CMD_READ_QUAD_IO_FAST:
+ flash->dummy_cycles = 2;
+ break;
+ case CMD_READ_ARRAY_SLOW:
+ flash->dummy_cycles = 0;
+ break;
+ default:
+ flash->dummy_cycles = 1;
+ }
+