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

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



Create a SPI NOR manufacturer driver for Everspin chips, and move the
Everspin 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 74c7e0e3

drivers/mtd/spi-nor/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,4 +4,5 @@ spi-nor-objs := core.o sfdp.o 
spi-nor-objs			+= atmel.o

spi-nor-objs			+= eon.o

spi-nor-objs			+= esmt.o

spi-nor-objs			+= everspin.o

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

drivers/mtd/spi-nor/core.c

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

 */

static const struct flash_info spi_nor_ids[] = {

	/* Everspin */

	{ "mr25h128", CAT25_INFO( 16 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "mr25h10",  CAT25_INFO(128 * 1024, 1, 256, 3, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "mr25h40",  CAT25_INFO(512 * 1024, 1, 256, 3, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },



	/* Fujitsu */

	{ "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) },
@@ -2437,6 +2431,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { 
	&spi_nor_atmel,

	&spi_nor_eon,

	&spi_nor_esmt,

	&spi_nor_everspin,

};



static const struct flash_info *

drivers/mtd/spi-nor/core.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ struct spi_nor_manufacturer { 
extern const struct spi_nor_manufacturer spi_nor_atmel;

extern const struct spi_nor_manufacturer spi_nor_eon;

extern const struct spi_nor_manufacturer spi_nor_esmt;

extern const struct spi_nor_manufacturer spi_nor_everspin;



int spi_nor_write_enable(struct spi_nor *nor);

int spi_nor_write_disable(struct spi_nor *nor);

drivers/mtd/spi-nor/everspin.c

0 → 100644
+27 −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 everspin_parts[] = {

	/* Everspin */

	{ "mr25h128", CAT25_INFO(16 * 1024, 1, 256, 2,

				 SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "mr25h256", CAT25_INFO(32 * 1024, 1, 256, 2,

				 SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "mr25h10",  CAT25_INFO(128 * 1024, 1, 256, 3,

				 SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "mr25h40",  CAT25_INFO(512 * 1024, 1, 256, 3,

				 SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

};



const struct spi_nor_manufacturer spi_nor_everspin = {

	.name = "everspin",

	.parts = everspin_parts,

	.nparts = ARRAY_SIZE(everspin_parts),

};