|
@@ -31,9 +31,9 @@ enum spi_read_cmds {
|
|
|
};
|
|
|
|
|
|
/* Normal - Extended - Full command set */
|
|
|
-#define RD_NORM (ARRAY_SLOW | ARRAY_FAST)
|
|
|
-#define RD_EXTN (RD_NORM | DUAL_OUTPUT_FAST | DUAL_IO_FAST)
|
|
|
-#define RD_FULL (RD_EXTN | QUAD_OUTPUT_FAST | QUAD_IO_FAST)
|
|
|
+#define RD_NORM (ARRAY_SLOW | ARRAY_FAST)
|
|
|
+#define RD_EXTN (RD_NORM | DUAL_OUTPUT_FAST | DUAL_IO_FAST)
|
|
|
+#define RD_FULL (RD_EXTN | QUAD_OUTPUT_FAST | QUAD_IO_FAST)
|
|
|
|
|
|
/* sf param flags */
|
|
|
enum {
|
|
@@ -67,12 +67,12 @@ enum {
|
|
|
#define CMD_WRITE_STATUS 0x01
|
|
|
#define CMD_PAGE_PROGRAM 0x02
|
|
|
#define CMD_WRITE_DISABLE 0x04
|
|
|
-#define CMD_READ_STATUS 0x05
|
|
|
+#define CMD_READ_STATUS 0x05
|
|
|
#define CMD_QUAD_PAGE_PROGRAM 0x32
|
|
|
#define CMD_READ_STATUS1 0x35
|
|
|
#define CMD_WRITE_ENABLE 0x06
|
|
|
-#define CMD_READ_CONFIG 0x35
|
|
|
-#define CMD_FLAG_STATUS 0x70
|
|
|
+#define CMD_READ_CONFIG 0x35
|
|
|
+#define CMD_FLAG_STATUS 0x70
|
|
|
|
|
|
/* Read commands */
|
|
|
#define CMD_READ_ARRAY_SLOW 0x03
|
|
@@ -99,13 +99,13 @@ enum {
|
|
|
|
|
|
/* Flash timeout values */
|
|
|
#define SPI_FLASH_PROG_TIMEOUT (2 * CONFIG_SYS_HZ)
|
|
|
-#define SPI_FLASH_PAGE_ERASE_TIMEOUT (5 * CONFIG_SYS_HZ)
|
|
|
+#define SPI_FLASH_PAGE_ERASE_TIMEOUT (5 * CONFIG_SYS_HZ)
|
|
|
#define SPI_FLASH_SECTOR_ERASE_TIMEOUT (10 * CONFIG_SYS_HZ)
|
|
|
|
|
|
/* SST specific */
|
|
|
#ifdef CONFIG_SPI_FLASH_SST
|
|
|
# define CMD_SST_BP 0x02 /* Byte Program */
|
|
|
-# define CMD_SST_AAI_WP 0xAD /* Auto Address Incr Word Program */
|
|
|
+# define CMD_SST_AAI_WP 0xAD /* Auto Address Incr Word Program */
|
|
|
|
|
|
int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len,
|
|
|
const void *buf);
|
|
@@ -121,7 +121,7 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len,
|
|
|
* @ext_jedec: Device ext_jedec ID
|
|
|
* @sector_size: Isn't necessarily a sector size from vendor,
|
|
|
* the size listed here is what works with CMD_ERASE_64K
|
|
|
- * @nr_sectors: No.of sectors on this device
|
|
|
+ * @nr_sectors: No.of sectors on this device
|
|
|
* @e_rd_cmd: Enum list for read commands
|
|
|
* @flags: Important param, for flash specific behaviour
|
|
|
*/
|