diff options
author | Brian Norris <computersforpeace@gmail.com> | 2014-04-08 21:31:16 -0400 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2014-04-14 14:23:01 -0400 |
commit | a402191e9b5090f1db60af7d36f2568a1e648dff (patch) | |
tree | 02d8839a76d452786ad2b115ff207c344e88e751 /drivers/mtd/devices/st_spi_fsm.c | |
parent | 8607bd42728c648f03cb04f8906411ba3da984e5 (diff) |
mtd: st_spi_fsm: kill duplicate CMD definitions
These are also in serial_flash_cmds.h. (FWIW, I didn't know the C
preprocessor allowed redefinitions without warning like this.)
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'drivers/mtd/devices/st_spi_fsm.c')
-rw-r--r-- | drivers/mtd/devices/st_spi_fsm.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c index 30082a09f68b..122a8a14ef84 100644 --- a/drivers/mtd/devices/st_spi_fsm.c +++ b/drivers/mtd/devices/st_spi_fsm.c | |||
@@ -201,42 +201,6 @@ | |||
201 | 201 | ||
202 | #define STFSM_MAX_WAIT_SEQ_MS 1000 /* FSM execution time */ | 202 | #define STFSM_MAX_WAIT_SEQ_MS 1000 /* FSM execution time */ |
203 | 203 | ||
204 | /* Flash Commands */ | ||
205 | #define FLASH_CMD_WREN 0x06 | ||
206 | #define FLASH_CMD_WRDI 0x04 | ||
207 | #define FLASH_CMD_RDID 0x9f | ||
208 | #define FLASH_CMD_RDSR 0x05 | ||
209 | #define FLASH_CMD_RDSR2 0x35 | ||
210 | #define FLASH_CMD_WRSR 0x01 | ||
211 | #define FLASH_CMD_SE_4K 0x20 | ||
212 | #define FLASH_CMD_SE_32K 0x52 | ||
213 | #define FLASH_CMD_SE 0xd8 | ||
214 | #define FLASH_CMD_CHIPERASE 0xc7 | ||
215 | |||
216 | #define FLASH_CMD_READ 0x03 /* READ */ | ||
217 | #define FLASH_CMD_READ_FAST 0x0b /* FAST READ */ | ||
218 | #define FLASH_CMD_READ_1_1_2 0x3b /* DUAL OUTPUT READ */ | ||
219 | #define FLASH_CMD_READ_1_2_2 0xbb /* DUAL I/O READ */ | ||
220 | #define FLASH_CMD_READ_1_1_4 0x6b /* QUAD OUTPUT READ */ | ||
221 | #define FLASH_CMD_READ_1_4_4 0xeb /* QUAD I/O READ */ | ||
222 | |||
223 | #define FLASH_CMD_WRITE 0x02 /* PAGE PROGRAM */ | ||
224 | #define FLASH_CMD_WRITE_1_1_2 0xa2 /* DUAL INPUT PROGRAM */ | ||
225 | #define FLASH_CMD_WRITE_1_2_2 0xd2 /* DUAL INPUT EXT PROGRAM */ | ||
226 | #define FLASH_CMD_WRITE_1_1_4 0x32 /* QUAD INPUT PROGRAM */ | ||
227 | #define FLASH_CMD_WRITE_1_4_4 0x12 /* QUAD INPUT EXT PROGRAM */ | ||
228 | |||
229 | #define FLASH_CMD_EN4B_ADDR 0xb7 /* Enter 4-byte address mode */ | ||
230 | #define FLASH_CMD_EX4B_ADDR 0xe9 /* Exit 4-byte address mode */ | ||
231 | |||
232 | /* READ commands with 32-bit addressing (N25Q256 and S25FLxxxS) */ | ||
233 | #define FLASH_CMD_READ4 0x13 | ||
234 | #define FLASH_CMD_READ4_FAST 0x0c | ||
235 | #define FLASH_CMD_READ4_1_1_2 0x3c | ||
236 | #define FLASH_CMD_READ4_1_2_2 0xbc | ||
237 | #define FLASH_CMD_READ4_1_1_4 0x6c | ||
238 | #define FLASH_CMD_READ4_1_4_4 0xec | ||
239 | |||
240 | /* S25FLxxxS commands */ | 204 | /* S25FLxxxS commands */ |
241 | #define S25FL_CMD_WRITE4_1_1_4 0x34 | 205 | #define S25FL_CMD_WRITE4_1_1_4 0x34 |
242 | #define S25FL_CMD_SE4 0xdc | 206 | #define S25FL_CMD_SE4 0xdc |