V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

spi/sf: Minor cleanups 

- Adjust tab spaces
- Add comments

Signed-off-by: Jagan Teki <jteki@openedev.com>
This commit is contained in:
Jagan Teki 2015-06-27 00:51:30 +05:30
parent ff6e31d3a1
commit 5d69df3541
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/mtd/spi/sf_internal.h
View File

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

2
include/spi.h
View File

@ -54,7 +54,7 @@
/* Header byte that marks the start of the message */ /* Header byte that marks the start of the message */
#define SPI_PREAMBLE_END_BYTE 0xec #define SPI_PREAMBLE_END_BYTE 0xec
#define SPI_DEFAULT_WORDLEN 8 #define SPI_DEFAULT_WORDLEN 8
#ifdef CONFIG_DM_SPI #ifdef CONFIG_DM_SPI
/* TODO(sjg@chromium.org): Remove this and use max_hz from struct spi_slave */ /* TODO(sjg@chromium.org): Remove this and use max_hz from struct spi_slave */

10
include/spi_flash.h
View File

@ -37,13 +37,15 @@ struct spi_slave;
* struct spi_flash - SPI flash structure * struct spi_flash - SPI flash structure
* *
* @spi: SPI slave * @spi: SPI slave
* @dev: SPI flash device
* @flags: Indication of spi flash flags
* @name: Name of SPI flash * @name: Name of SPI flash
* @dual_flash: Indicates dual flash memories - dual stacked, parallel * @dual_flash: Indicates dual flash memories - dual stacked, parallel
* @shift: Flash shift useful in dual parallel * @shift: Flash shift useful in dual parallel
* @size: Total flash size * @size: Total flash size
* @page_size: Write (page) size * @page_size: Write (page) size
* @sector_size: Sector size * @sector_size: Sector size
* @erase_size: Erase size * @erase_size: Erase size
* @bank_read_cmd: Bank read cmd * @bank_read_cmd: Bank read cmd
* @bank_write_cmd: Bank write cmd * @bank_write_cmd: Bank write cmd
* @bank_curr: Current flash bank * @bank_curr: Current flash bank
@ -51,8 +53,8 @@ struct spi_slave;
* @erase_cmd: Erase cmd 4K, 32K, 64K * @erase_cmd: Erase cmd 4K, 32K, 64K
* @read_cmd: Read cmd - Array Fast, Extn read and quad read. * @read_cmd: Read cmd - Array Fast, Extn read and quad read.
* @write_cmd: Write cmd - page and quad program. * @write_cmd: Write cmd - page and quad program.
* @dummy_byte: Dummy cycles for read operation. * @dummy_byte: Dummy cycles for read operation.
* @memory_map: Address of read-only SPI flash access * @memory_map: Address of read-only SPI flash access
* @read: Flash read ops: Read len bytes at offset into buf * @read: Flash read ops: Read len bytes at offset into buf
* Supported cmds: Fast Array Read * Supported cmds: Fast Array Read
* @write: Flash write ops: Write len bytes from buf into offset * @write: Flash write ops: Write len bytes from buf into offset