Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a402191e authored by Brian Norris's avatar Brian Norris
Browse files

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: default avatarBrian Norris <computersforpeace@gmail.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarMarek Vasut <marex@denx.de>
parent 8607bd42

drivers/mtd/devices/st_spi_fsm.c

+0 −36
Original line number Diff line number Diff line
@@ -201,42 +201,6 @@ 


#define STFSM_MAX_WAIT_SEQ_MS  1000     /* FSM execution time */



/* Flash Commands */

#define FLASH_CMD_WREN         0x06

#define FLASH_CMD_WRDI         0x04

#define FLASH_CMD_RDID         0x9f

#define FLASH_CMD_RDSR         0x05

#define FLASH_CMD_RDSR2                0x35

#define FLASH_CMD_WRSR         0x01

#define FLASH_CMD_SE_4K                0x20

#define FLASH_CMD_SE_32K       0x52

#define FLASH_CMD_SE           0xd8

#define FLASH_CMD_CHIPERASE    0xc7



#define FLASH_CMD_READ         0x03    /* READ */

#define FLASH_CMD_READ_FAST    0x0b    /* FAST READ */

#define FLASH_CMD_READ_1_1_2   0x3b    /* DUAL OUTPUT READ */

#define FLASH_CMD_READ_1_2_2   0xbb    /* DUAL I/O READ */

#define FLASH_CMD_READ_1_1_4   0x6b    /* QUAD OUTPUT READ */

#define FLASH_CMD_READ_1_4_4   0xeb    /* QUAD I/O READ */



#define FLASH_CMD_WRITE                0x02    /* PAGE PROGRAM */

#define FLASH_CMD_WRITE_1_1_2  0xa2    /* DUAL INPUT PROGRAM */

#define FLASH_CMD_WRITE_1_2_2  0xd2    /* DUAL INPUT EXT PROGRAM */

#define FLASH_CMD_WRITE_1_1_4  0x32    /* QUAD INPUT PROGRAM */

#define FLASH_CMD_WRITE_1_4_4  0x12    /* QUAD INPUT EXT PROGRAM */



#define FLASH_CMD_EN4B_ADDR    0xb7    /* Enter 4-byte address mode */

#define FLASH_CMD_EX4B_ADDR    0xe9    /* Exit 4-byte address mode */



/* READ commands with 32-bit addressing (N25Q256 and S25FLxxxS) */

#define FLASH_CMD_READ4                0x13

#define FLASH_CMD_READ4_FAST   0x0c

#define FLASH_CMD_READ4_1_1_2  0x3c

#define FLASH_CMD_READ4_1_2_2  0xbc

#define FLASH_CMD_READ4_1_1_4  0x6c

#define FLASH_CMD_READ4_1_4_4  0xec



/* S25FLxxxS commands */

#define S25FL_CMD_WRITE4_1_1_4 0x34

#define S25FL_CMD_SE4          0xdc