diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-07-20 08:58:06 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-07-20 08:58:06 +0200 |
| commit | ad8439d4645200b5a4f230dd07b73ae956b88c1e (patch) | |
| tree | d786dd7edc365175967d5f2cc21b7a65dfd44f2b /drivers/mtd/spi/macronix.c | |
| parent | 062cf36f674db38d1ce27addfdcb5b3a6160b362 (diff) | |
| parent | 7d72b80a903f64721c845cebaa1077a78aacb724 (diff) | |
Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
* 'sf' of git://git.denx.de/u-boot-blackfin:
sf: spansion: inline useless id defines
sf: drop unused/duplicate command defines
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/mtd/spi/macronix.c')
| -rw-r--r-- | drivers/mtd/spi/macronix.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/mtd/spi/macronix.c b/drivers/mtd/spi/macronix.c index dacbc28b3e5..87a3ad0c302 100644 --- a/drivers/mtd/spi/macronix.c +++ b/drivers/mtd/spi/macronix.c @@ -36,18 +36,9 @@ #include "spi_flash_internal.h" /* MX25xx-specific commands */ -#define CMD_MX25XX_WREN 0x06 /* Write Enable */ -#define CMD_MX25XX_WRDI 0x04 /* Write Disable */ -#define CMD_MX25XX_RDSR 0x05 /* Read Status Register */ -#define CMD_MX25XX_WRSR 0x01 /* Write Status Register */ -#define CMD_MX25XX_READ 0x03 /* Read Data Bytes */ -#define CMD_MX25XX_FAST_READ 0x0b /* Read Data Bytes at Higher Speed */ -#define CMD_MX25XX_PP 0x02 /* Page Program */ #define CMD_MX25XX_SE 0x20 /* Sector Erase */ #define CMD_MX25XX_BE 0xD8 /* Block Erase */ #define CMD_MX25XX_CE 0xc7 /* Chip Erase */ -#define CMD_MX25XX_DP 0xb9 /* Deep Power-down */ -#define CMD_MX25XX_RES 0xab /* Release from DP, and Read Signature */ struct macronix_spi_flash_params { u16 idcode; @@ -128,7 +119,7 @@ static int macronix_write_status(struct spi_flash *flash, u8 sr) return ret; } - cmd = CMD_MX25XX_WRSR; + cmd = CMD_WRITE_STATUS; ret = spi_flash_cmd_write(flash->spi, &cmd, 1, &sr, 1); if (ret) { debug("SF: fail to write status register\n"); |