Unverified Commit d3c4bb31 authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

mtd: spi-nor: Drop the MFR definitions 



Cross manufacturer code is unlikely and discouraged, get rid of the
MFR definitions.

Suggested-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
parent c4fdfdc1

drivers/mtd/spi-nor/core.c

+0 −2
Original line number Diff line number Diff line
@@ -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

include/linux/mtd/spi-nor.h

+0 −17
Original line number Diff line number Diff line
@@ -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