summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJagannadha Sutradharudu Teki <jaganna@xilinx.com>2014-01-11 15:13:11 +0530
committerJagannadha Sutradharudu Teki <jaganna@xilinx.com>2014-01-11 15:13:11 +0530
commit3163aaa63fced54bbd6fd190ece0f89b473076ab (patch)
tree8fe620871faabe5bd9ffb3c2d8a262e2f86ccf4b /include
parent4e09cc1e2c5d22735d0fa3d2d1eaecd27e19948e (diff)
downloadblackbird-obmc-uboot-3163aaa63fced54bbd6fd190ece0f89b473076ab.tar.gz
blackbird-obmc-uboot-3163aaa63fced54bbd6fd190ece0f89b473076ab.zip
sf: Add quad read/write commands support
This patch add quad commands support like - QUAD_PAGE_PROGRAM => for write program - QUAD_OUTPUT_FAST ->> for read program Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Diffstat (limited to 'include')
-rw-r--r--include/spi.h9
-rw-r--r--include/spi_flash.h11
2 files changed, 17 insertions, 3 deletions
diff --git a/include/spi.h b/include/spi.h
index 31195a3075..5dd490a66e 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -31,11 +31,16 @@
#define SPI_XFER_MMAP_END 0x10 /* Memory Mapped End */
#define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END)
+/* SPI TX operation modes */
+#define SPI_OPM_TX_QPP 1 << 0
+
/* SPI RX operation modes */
#define SPI_OPM_RX_AS 1 << 0
#define SPI_OPM_RX_DOUT 1 << 1
#define SPI_OPM_RX_DIO 1 << 2
-#define SPI_OPM_RX_EXTN SPI_OPM_RX_AS | SPI_OPM_RX_DOUT | SPI_OPM_RX_DIO
+#define SPI_OPM_RX_QOF 1 << 3
+#define SPI_OPM_RX_EXTN SPI_OPM_RX_AS | SPI_OPM_RX_DOUT | \
+ SPI_OPM_RX_DIO | SPI_OPM_RX_QOF
/* Header byte that marks the start of the message */
#define SPI_PREAMBLE_END_BYTE 0xec
@@ -50,6 +55,7 @@
* @bus: ID of the bus that the slave is attached to.
* @cs: ID of the chip select connected to the slave.
* @op_mode_rx: SPI RX operation mode.
+ * @op_mode_tx: SPI TX operation mode.
* @wordlen: Size of SPI word in number of bits
* @max_write_size: If non-zero, the maximum number of bytes which can
* be written at once, excluding command bytes.
@@ -59,6 +65,7 @@ struct spi_slave {
unsigned int bus;
unsigned int cs;
u8 op_mode_rx;
+ u8 op_mode_tx;
unsigned int wordlen;
unsigned int max_write_size;
void *memory_map;
diff --git a/include/spi_flash.h b/include/spi_flash.h
index 692e143b60..9fd9d3bd54 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -19,13 +19,18 @@
#include <linux/types.h>
#include <linux/compiler.h>
-/* Enum list - Extended read commands */
+/* No enum list for write commands only QPP */
+#define WR_QPP 1 << 4
+
+/* Enum list - Full read commands */
enum spi_read_cmds {
ARRAY_SLOW = 1 << 0,
DUAL_OUTPUT_FAST = 1 << 1,
DUAL_IO_FAST = 1 << 2,
+ QUAD_OUTPUT_FAST = 1 << 3,
};
#define RD_EXTN ARRAY_SLOW | DUAL_OUTPUT_FAST | DUAL_IO_FAST
+#define RD_FULL RD_EXTN | QUAD_OUTPUT_FAST
/**
* struct spi_flash - SPI flash structure
@@ -41,7 +46,8 @@ enum spi_read_cmds {
* @bank_curr: Current flash bank
* @poll_cmd: Poll cmd - for flash erase/program
* @erase_cmd: Erase cmd 4K, 32K, 64K
- * @read_cmd: Read cmd - Array Fast and Extn read
+ * @read_cmd: Read cmd - Array Fast, Extn read and quad read.
+ * @write_cmd: Write cmd - page and quad program.
* @memory_map: Address of read-only SPI flash access
* @read: Flash read ops: Read len bytes at offset into buf
* Supported cmds: Fast Array Read
@@ -67,6 +73,7 @@ struct spi_flash {
u8 poll_cmd;
u8 erase_cmd;
u8 read_cmd;
+ u8 write_cmd;
void *memory_map;
int (*read)(struct spi_flash *flash, u32 offset, size_t len, void *buf);
OpenPOWER on IntegriCloud