Skip to content

Commit d3c4bb3

Browse files
committed
mtd: spi-nor: Drop the MFR definitions
Cross manufacturer code is unlikely and discouraged, get rid of the MFR definitions. Suggested-by: Vignesh Raghavendra <[email protected]> Signed-off-by: Tudor Ambarus <[email protected]> Reviewed-by: Boris Brezillon <[email protected]>
1 parent c4fdfdc commit d3c4bb3

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

drivers/mtd/spi-nor/core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040

4141
#define SPI_NOR_MAX_ADDR_WIDTH 4
4242

43-
#define JEDEC_MFR(info) ((info)->id[0])
44-
4543
/**
4644
* spi_nor_spimem_bounce() - check if a bounce buffer is needed for the data
4745
* transfer

include/linux/mtd/spi-nor.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,6 @@
1111
#include <linux/mtd/mtd.h>
1212
#include <linux/spi/spi-mem.h>
1313

14-
/*
15-
* Manufacturer IDs
16-
*
17-
* The first byte returned from the flash after sending opcode SPINOR_OP_RDID.
18-
* Sometimes these are the same as CFI IDs, but sometimes they aren't.
19-
*/
20-
#define SNOR_MFR_ATMEL CFI_MFR_ATMEL
21-
#define SNOR_MFR_GIGADEVICE 0xc8
22-
#define SNOR_MFR_INTEL CFI_MFR_INTEL
23-
#define SNOR_MFR_ST CFI_MFR_ST /* ST Micro */
24-
#define SNOR_MFR_MICRON CFI_MFR_MICRON /* Micron */
25-
#define SNOR_MFR_ISSI CFI_MFR_PMC
26-
#define SNOR_MFR_MACRONIX CFI_MFR_MACRONIX
27-
#define SNOR_MFR_SPANSION CFI_MFR_AMD
28-
#define SNOR_MFR_SST CFI_MFR_SST
29-
#define SNOR_MFR_WINBOND 0xef /* Also used by some Spansion */
30-
3114
/*
3215
* Note on opcode nomenclature: some opcodes have a format like
3316
* SPINOR_OP_FUNCTION{4,}_x_y_z. The numbers x, y, and z stand for the number

0 commit comments

Comments
 (0)