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

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



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

drivers/mtd/spi-nor/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


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

spi-nor-objs			+= atmel.o

spi-nor-objs			+= catalyst.o

spi-nor-objs			+= eon.o

spi-nor-objs			+= esmt.o

spi-nor-objs			+= everspin.o

drivers/mtd/spi-nor/catalyst.c

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

	/* Catalyst / On Semiconductor -- non-JEDEC */

	{ "cat25c11", CAT25_INFO(16, 8, 16, 1,

				 SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "cat25c03", CAT25_INFO(32, 8, 16, 2,

				 SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "cat25c09", CAT25_INFO(128, 8, 32, 2,

				 SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "cat25c17", CAT25_INFO(256, 8, 32, 2,

				 SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "cat25128", CAT25_INFO(2048, 8, 64, 2,

				 SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

};



const struct spi_nor_manufacturer spi_nor_catalyst = {

	.name = "catalyst",

	.parts = catalyst_parts,

	.nparts = ARRAY_SIZE(catalyst_parts),

};

drivers/mtd/spi-nor/core.c

+1 −7
Original line number Diff line number Diff line
@@ -1963,13 +1963,6 @@ int spi_nor_sr2_bit7_quad_enable(struct spi_nor *nor) 
 * old entries may be missing 4K flag.

 */

static const struct flash_info spi_nor_ids[] = {

	/* Catalyst / On Semiconductor -- non-JEDEC */

	{ "cat25c11", CAT25_INFO(  16, 8, 16, 1, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "cat25c03", CAT25_INFO(  32, 8, 16, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "cat25c09", CAT25_INFO( 128, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "cat25c17", CAT25_INFO( 256, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

	{ "cat25128", CAT25_INFO(2048, 8, 64, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },



	/* Xilinx S3AN Internal Flash */

	{ "3S50AN", S3AN_INFO(0x1f2200, 64, 264) },

	{ "3S200AN", S3AN_INFO(0x1f2400, 256, 264) },
@@ -1985,6 +1978,7 @@ static const struct flash_info spi_nor_ids[] = { 


static const struct spi_nor_manufacturer *manufacturers[] = {

	&spi_nor_atmel,

	&spi_nor_catalyst,

	&spi_nor_eon,

	&spi_nor_esmt,

	&spi_nor_everspin,

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_catalyst;

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;