| Message ID | 20200313194130.342251-25-tudor.ambarus@microchip.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d3c4bb31bf627ede607d7b1827e6be43f1b26be7 |
| Headers | show |
| Series | mtd: spi-nor: Move manufacturer/SFDP code out | expand |
On Fri, 13 Mar 2020 19:42:52 +0000 <Tudor.Ambarus@microchip.com> wrote: > From: Tudor Ambarus <tudor.ambarus@microchip.com> > > Cross manufacturer code is unlikely and discouraged, get rid of the > MFR definitions. > > Suggested-by: Vignesh Raghavendra <vigneshr@ti.com> > Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > drivers/mtd/spi-nor/core.c | 2 -- > include/linux/mtd/spi-nor.h | 17 ----------------- > 2 files changed, 19 deletions(-) > > diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c > index baee58fd8b04..b07e66f10995 100644 > --- a/drivers/mtd/spi-nor/core.c > +++ b/drivers/mtd/spi-nor/core.c > @@ -40,8 +40,6 @@ > > #define SPI_NOR_MAX_ADDR_WIDTH 4 > > -#define JEDEC_MFR(info) ((info)->id[0]) > - > /** > * spi_nor_spimem_bounce() - check if a bounce buffer is needed for the data > * transfer > diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h > index bf37bfc68797..2f7725525460 100644 > --- a/include/linux/mtd/spi-nor.h > +++ b/include/linux/mtd/spi-nor.h > @@ -11,23 +11,6 @@ > #include <linux/mtd/mtd.h> > #include <linux/spi/spi-mem.h> > > -/* > - * Manufacturer IDs > - * > - * The first byte returned from the flash after sending opcode SPINOR_OP_RDID. > - * Sometimes these are the same as CFI IDs, but sometimes they aren't. > - */ > -#define SNOR_MFR_ATMEL CFI_MFR_ATMEL > -#define SNOR_MFR_GIGADEVICE 0xc8 > -#define SNOR_MFR_INTEL CFI_MFR_INTEL > -#define SNOR_MFR_ST CFI_MFR_ST /* ST Micro */ > -#define SNOR_MFR_MICRON CFI_MFR_MICRON /* Micron */ > -#define SNOR_MFR_ISSI CFI_MFR_PMC > -#define SNOR_MFR_MACRONIX CFI_MFR_MACRONIX > -#define SNOR_MFR_SPANSION CFI_MFR_AMD > -#define SNOR_MFR_SST CFI_MFR_SST > -#define SNOR_MFR_WINBOND 0xef /* Also used by some Spansion */ > - > /* > * Note on opcode nomenclature: some opcodes have a format like > * SPINOR_OP_FUNCTION{4,}_x_y_z. The numbers x, y, and z stand for the number
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index baee58fd8b04..b07e66f10995 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -40,8 +40,6 @@ #define SPI_NOR_MAX_ADDR_WIDTH 4 -#define JEDEC_MFR(info) ((info)->id[0]) - /** * spi_nor_spimem_bounce() - check if a bounce buffer is needed for the data * transfer diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index bf37bfc68797..2f7725525460 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -11,23 +11,6 @@ #include <linux/mtd/mtd.h> #include <linux/spi/spi-mem.h> -/* - * Manufacturer IDs - * - * The first byte returned from the flash after sending opcode SPINOR_OP_RDID. - * Sometimes these are the same as CFI IDs, but sometimes they aren't. - */ -#define SNOR_MFR_ATMEL CFI_MFR_ATMEL -#define SNOR_MFR_GIGADEVICE 0xc8 -#define SNOR_MFR_INTEL CFI_MFR_INTEL -#define SNOR_MFR_ST CFI_MFR_ST /* ST Micro */ -#define SNOR_MFR_MICRON CFI_MFR_MICRON /* Micron */ -#define SNOR_MFR_ISSI CFI_MFR_PMC -#define SNOR_MFR_MACRONIX CFI_MFR_MACRONIX -#define SNOR_MFR_SPANSION CFI_MFR_AMD -#define SNOR_MFR_SST CFI_MFR_SST -#define SNOR_MFR_WINBOND 0xef /* Also used by some Spansion */ - /* * Note on opcode nomenclature: some opcodes have a format like * SPINOR_OP_FUNCTION{4,}_x_y_z. The numbers x, y, and z stand for the number