Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sf: Code cleanups

Browse Source 
- comment typo's
- func args have a proper names

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
master
Jagannadha Sutradharudu Teki 11 years ago
parent 9f4322fd22
commit 2ba863fae6
4 changed files with 12 additions and 14 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 11
      drivers/mtd/spi/sf_internal.h
  2. 6
      drivers/mtd/spi/sf_ops.c
  3. 4
      drivers/mtd/spi/sf_probe.c
  4. 5
      include/spi_flash.h

11
drivers/mtd/spi/sf_internal.h
Unescape View File

@ -20,11 +20,6 @@
#define SPI_FLASH_CFI_MFR_MACRONIX 0xc2 #define SPI_FLASH_CFI_MFR_MACRONIX 0xc2
#define SPI_FLASH_CFI_MFR_WINBOND 0xef #define SPI_FLASH_CFI_MFR_WINBOND 0xef
/* SECT flags */
#define SECT_4K (1 << 1)
#define SECT_32K (1 << 2)
#define E_FSR (1 << 3)
/* Erase commands */ /* Erase commands */
#define CMD_ERASE_4K 0x20 #define CMD_ERASE_4K 0x20
#define CMD_ERASE_32K 0x52 #define CMD_ERASE_32K 0x52
@ -60,10 +55,10 @@
#endif #endif
/* Common status */ /* Common status */
#define STATUS_WIP 0x01 #define STATUS_WIP (1 << 0)
#define STATUS_QEB_WINSPAN (1 << 1) #define STATUS_QEB_WINSPAN (1 << 1)
#define STATUS_QEB_MXIC (1 << 6) #define STATUS_QEB_MXIC (1 << 6)
#define STATUS_PEC 0x80 #define STATUS_PEC (1 << 7)
/* Flash timeout values */ /* Flash timeout values */
#define SPI_FLASH_PROG_TIMEOUT (2 * CONFIG_SYS_HZ) #define SPI_FLASH_PROG_TIMEOUT (2 * CONFIG_SYS_HZ)
@ -105,7 +100,7 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len);
int spi_flash_cmd_read_status(struct spi_flash *flash, u8 *rs); int spi_flash_cmd_read_status(struct spi_flash *flash, u8 *rs);
/* Program the status register */ /* Program the status register */
int spi_flash_cmd_write_status(struct spi_flash *flash, u8 sr); int spi_flash_cmd_write_status(struct spi_flash *flash, u8 ws);
/* Read the config register */ /* Read the config register */
int spi_flash_cmd_read_config(struct spi_flash *flash, u8 *rc); int spi_flash_cmd_read_config(struct spi_flash *flash, u8 *rc);

6
drivers/mtd/spi/sf_ops.c
Unescape View File

@ -39,13 +39,13 @@ int spi_flash_cmd_read_status(struct spi_flash *flash, u8 *rs)
return 0; return 0;
} }
int spi_flash_cmd_write_status(struct spi_flash *flash, u8 sr) int spi_flash_cmd_write_status(struct spi_flash *flash, u8 ws)
{ {
u8 cmd; u8 cmd;
int ret; int ret;
cmd = CMD_WRITE_STATUS; cmd = CMD_WRITE_STATUS;
ret = spi_flash_write_common(flash, &cmd, 1, &sr, 1); ret = spi_flash_write_common(flash, &cmd, 1, &ws, 1);
if (ret < 0) { if (ret < 0) {
debug("SF: fail to write status register\n"); debug("SF: fail to write status register\n");
return ret; return ret;
@ -279,7 +279,7 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
spi_flash_addr(offset, cmd); spi_flash_addr(offset, cmd);
debug("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n", debug("SF: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
ret = spi_flash_write_common(flash, cmd, sizeof(cmd), ret = spi_flash_write_common(flash, cmd, sizeof(cmd),

4
drivers/mtd/spi/sf_probe.c
Unescape View File

@ -167,7 +167,7 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi,
cmd = spi_read_cmds_array[cmd - 1]; cmd = spi_read_cmds_array[cmd - 1];
flash->read_cmd = cmd; flash->read_cmd = cmd;
} else { } else {
/* Go for for default supported read cmd */ /* Go for default supported read cmd */
flash->read_cmd = CMD_READ_ARRAY_FAST; flash->read_cmd = CMD_READ_ARRAY_FAST;
} }
@ -207,7 +207,7 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi,
flash->dummy_byte = 1; flash->dummy_byte = 1;
} }
/* Poll cmd seclection */ /* Poll cmd selection */
flash->poll_cmd = CMD_READ_STATUS; flash->poll_cmd = CMD_READ_STATUS;
#ifdef CONFIG_SPI_FLASH_STMICRO #ifdef CONFIG_SPI_FLASH_STMICRO
if (params->flags & E_FSR) if (params->flags & E_FSR)

5
include/spi_flash.h
Unescape View File

@ -19,7 +19,10 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
/* No enum list for write commands only QPP */ /* sf param flags */
#define SECT_4K 1 << 1
#define SECT_32K 1 << 2
#define E_FSR 1 << 3
#define WR_QPP 1 << 4 #define WR_QPP 1 << 4
/* Enum list - Full read commands */ /* Enum list - Full read commands */

Write Preview
Loading…
Cancel
Save