Unverified Commit d22a3be6 authored by Boris Brezillon's avatar Boris Brezillon Committed by Tudor Ambarus
Browse files

mtd: spi-nor: Move Eon bits out of core.c 



Create a SPI NOR manufacturer driver for Eon chips, and move the
Eon definitions outside of core.c.

Signed-off-by: default avatarBoris Brezillon <bbrezillon@kernel.org>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
parent f7242bfc

drivers/mtd/spi-nor/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 


spi-nor-objs			:= core.o sfdp.o

spi-nor-objs			+= atmel.o

spi-nor-objs			+= eon.o

obj-$(CONFIG_MTD_SPI_NOR)	+= spi-nor.o

drivers/mtd/spi-nor/core.c

+1 −17
Original line number Diff line number Diff line
@@ -2081,23 +2081,6 @@ static struct spi_nor_fixups gd25q256_fixups = { 
 * old entries may be missing 4K flag.

 */

static const struct flash_info spi_nor_ids[] = {

	/* EON -- en25xxx */

	{ "en25f32",    INFO(0x1c3116, 0, 64 * 1024,   64, SECT_4K) },

	{ "en25p32",    INFO(0x1c2016, 0, 64 * 1024,   64, 0) },

	{ "en25q32b",   INFO(0x1c3016, 0, 64 * 1024,   64, 0) },

	{ "en25p64",    INFO(0x1c2017, 0, 64 * 1024,  128, 0) },

	{ "en25q64",    INFO(0x1c3017, 0, 64 * 1024,  128, SECT_4K) },

	{ "en25q80a",   INFO(0x1c3014, 0, 64 * 1024,   16,

			SECT_4K | SPI_NOR_DUAL_READ) },

	{ "en25qh16",   INFO(0x1c7015, 0, 64 * 1024,   32,

			SECT_4K | SPI_NOR_DUAL_READ) },

	{ "en25qh32",   INFO(0x1c7016, 0, 64 * 1024,   64, 0) },

	{ "en25qh64",   INFO(0x1c7017, 0, 64 * 1024,  128,

			SECT_4K | SPI_NOR_DUAL_READ) },

	{ "en25qh128",  INFO(0x1c7018, 0, 64 * 1024,  256, 0) },

	{ "en25qh256",  INFO(0x1c7019, 0, 64 * 1024,  512, 0) },

	{ "en25s64",	INFO(0x1c3817, 0, 64 * 1024,  128, SECT_4K) },



	/* ESMT */

	{ "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K | SPI_NOR_HAS_LOCK) },

	{ "f25l32qa", INFO(0x8c4116, 0, 64 * 1024, 64, SECT_4K | SPI_NOR_HAS_LOCK) },
@@ -2457,6 +2440,7 @@ static const struct flash_info spi_nor_ids[] = { 


static const struct spi_nor_manufacturer *manufacturers[] = {

	&spi_nor_atmel,

	&spi_nor_eon,

};



static const struct flash_info *

drivers/mtd/spi-nor/core.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ struct spi_nor_manufacturer { 


/* Manufacturer drivers. */

extern const struct spi_nor_manufacturer spi_nor_atmel;

extern const struct spi_nor_manufacturer spi_nor_eon;



int spi_nor_write_enable(struct spi_nor *nor);

int spi_nor_write_disable(struct spi_nor *nor);

drivers/mtd/spi-nor/eon.c

0 → 100644
+34 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2005, Intec Automation Inc.

 * Copyright (C) 2014, Freescale Semiconductor, Inc.

 */



#include <linux/mtd/spi-nor.h>



#include "core.h"



static const struct flash_info eon_parts[] = {

	/* EON -- en25xxx */

	{ "en25f32",    INFO(0x1c3116, 0, 64 * 1024,   64, SECT_4K) },

	{ "en25p32",    INFO(0x1c2016, 0, 64 * 1024,   64, 0) },

	{ "en25q32b",   INFO(0x1c3016, 0, 64 * 1024,   64, 0) },

	{ "en25p64",    INFO(0x1c2017, 0, 64 * 1024,  128, 0) },

	{ "en25q64",    INFO(0x1c3017, 0, 64 * 1024,  128, SECT_4K) },

	{ "en25q80a",   INFO(0x1c3014, 0, 64 * 1024,   16,

			     SECT_4K | SPI_NOR_DUAL_READ) },

	{ "en25qh16",   INFO(0x1c7015, 0, 64 * 1024,   32,

			     SECT_4K | SPI_NOR_DUAL_READ) },

	{ "en25qh32",   INFO(0x1c7016, 0, 64 * 1024,   64, 0) },

	{ "en25qh64",   INFO(0x1c7017, 0, 64 * 1024,  128,

			     SECT_4K | SPI_NOR_DUAL_READ) },

	{ "en25qh128",  INFO(0x1c7018, 0, 64 * 1024,  256, 0) },

	{ "en25qh256",  INFO(0x1c7019, 0, 64 * 1024,  512, 0) },

	{ "en25s64",	INFO(0x1c3817, 0, 64 * 1024,  128, SECT_4K) },

};



const struct spi_nor_manufacturer spi_nor_eon = {

	.name = "eon",

	.parts = eon_parts,

	.nparts = ARRAY_SIZE(eon_parts),

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE